X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=bb88b3b97fca68641c04c6095822fa828863346d;hb=abb1abeb772c0876655c066d396f92ee46292c62;hp=73c9a15138f7b6e198b0a166c976d767216a846f;hpb=ab1f48a34668295275b794f1cc09839acc445c2b;p=ngircd.git

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 73c9a151..bb88b3b9 100644
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: ngircd.c,v 1.118 2008/02/26 22:04:17 fw Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.119 2008/03/18 20:12:47 fw Exp $";
 
 /**
  * @file
@@ -432,15 +432,16 @@ NGIRCd_Rehash( void )
 	Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" );
 	NGIRCd_SignalRehash = false;
 
-	/* Close down all listening sockets */
-	Conn_ExitListeners( );
-
 	/* Remember old server name and nick name length */
 	strlcpy( old_name, Conf_ServerName, sizeof old_name );
 	old_nicklen = Conf_MaxNickLength;
 
 	/* Re-read configuration ... */
-	Conf_Rehash( );
+	if (!Conf_Rehash( ))
+		return;
+
+	/* Close down all listening sockets */
+	Conn_ExitListeners( );
 
 	/* Recover old server name and nick name length: these values can't
 	 * be changed during run-time */