Committer  : entrope
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2007-04-05 01:52:50 UTC

Modified files:
  Tag: u2_10_12_branch
     ircd/s_conf.c ChangeLog

Log message:

Fix resolver after /rehash with no "dns server" directives.
(Bug reported by Ralf.)

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.176 ircu2.10/ChangeLog:1.710.2.177
--- ircu2.10/ChangeLog:1.710.2.176      Wed Apr  4 18:39:39 2007
+++ ircu2.10/ChangeLog  Wed Apr  4 18:52:39 2007
@@ -1,3 +1,9 @@
+2007-04-04  Michael Poole <[EMAIL PROTECTED]>
+
+       * 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 <[EMAIL PROTECTED]>
 
        * ircd/s_user.c (register_user): Check for host-hiding when fully
Index: ircu2.10/ircd/s_conf.c
diff -u ircu2.10/ircd/s_conf.c:1.81.2.7 ircu2.10/ircd/s_conf.c:1.81.2.8
--- ircu2.10/ircd/s_conf.c:1.81.2.7     Sat Mar 17 18:46:58 2007
+++ ircu2.10/ircd/s_conf.c      Wed Apr  4 18:52:39 2007
@@ -19,7 +19,7 @@
  */
 /** @file
  * @brief ircd configuration file driver
- * @version $Id: s_conf.c,v 1.81.2.7 2007/03/18 01:46:58 entrope Exp $
+ * @version $Id: s_conf.c,v 1.81.2.8 2007/04/05 01:52:39 entrope Exp $
  */
 #include "config.h"
 
@@ -945,9 +945,6 @@
 
   clear_quarantines();
 
-  if (sig != 2)
-    restart_resolver();
-
   class_mark_delete();
   mark_listeners_closing();
   auth_mark_closing();
@@ -955,6 +952,9 @@
 
   read_configuration_file();
 
+  if (sig != 2)
+    restart_resolver();
+
   log_reopen(); /* reopen log files */
 
   auth_close_unused();
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches

Reply via email to