Fix resolver after /rehash with no "dns server" directives.

(Bug reported by Ralf.)

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1798 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index d880af0c6a981d86509dead0c103ff26361f11c9..7ed903a5f180dd223faf866bcc1709acca4a8762 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-04  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/s_conf.c (rehash): Restart resolver after reading the
+       config file; this un-breaks the resolver after /rehash if the
+       ircd.conf contains no "dns server = <ipstring>;" lines.
+
 2007-04-01  J. R. Lenz <ralf@starshadow.com>
 
        * ircd/s_user.c (register_user): Check for host-hiding when fully

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 18f4b00744275eb0935cd3c7cae3cc1cf85a4f61..1dc438b14591253982b44c46370664ae07fc4c83 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -945,9 +945,6 @@ int rehash(struct Client *cptr, int sig)
 
   clear_quarantines();
 
-  if (sig != 2)
-    restart_resolver();
-
   class_mark_delete();
   mark_listeners_closing();
   auth_mark_closing();
@@ -955,6 +952,9 @@ int rehash(struct Client *cptr, int sig)
 
   read_configuration_file();
 
+  if (sig != 2)
+    restart_resolver();
+
   log_reopen(); /* reopen log files */
 
   auth_close_unused();