Commit Diff

Commit:
8dadb17f838c8650ed0ef0e518a4f661cc969e6f
From:
Alexander Barton <alex@barton.de>
Date:
Message:
- Changed "once"-server-config-flag into a generic flag. - Changed semantics of "NGIRCd_Passive".
Actions:
Patch | Tree
commit - 281f7583f558f32bc55c98a0beb1de576719a80f
commit + 8dadb17f838c8650ed0ef0e518a4f661cc969e6f
blob - 3975a920429dcb7b2bbf911bbd1b3272ffc1b3c9
blob + 8ef4bc7a6fe1cda7b208ffa54a627330f209e5e2
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.113 2002/12/30 17:14:59 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.114 2002/12/31 16:13:29 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -1162,9 +1162,6 @@ Check_Servers( VOID )
 	CONN_ID idx;
 	INT i, n;
 
-	/* Don't connect in "passive mode" */
-	if( NGIRCd_Passive ) return;
-
 	/* Serach all connections, are there results from the resolver? */
 	for( idx = 0; idx < Pool_Size; idx++ )
 	{
@@ -1177,8 +1174,8 @@ Check_Servers( VOID )
 	/* Check all configured servers */
 	for( i = 0; i < MAX_SERVERS; i++ )
 	{
-		/* Valid outgoing server which isn't already connected? */
-		if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 ) || ( Conf_Server[i].conn_id > NONE )) continue;
+		/* Valid outgoing server which isn't already connected or disabled? */
+		if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 ) || ( Conf_Server[i].conn_id > NONE ) || ( Conf_Server[i].flags & CONF_SFLAG_DISABLED )) continue;
 
 		/* Is there already a connection in this group? */
 		if( Conf_Server[i].group > NONE )