summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2002-12-31 16:13:29 +0000
committerAlexander Barton <alex@barton.de>2002-12-31 16:13:29 +0000
commit8dadb17f838c8650ed0ef0e518a4f661cc969e6f (patch)
tree9fe74a0f7a2d882c0df0ef992a063a5bea351fcd /src
parent281f7583f558f32bc55c98a0beb1de576719a80f (diff)
downloadngircd-8dadb17f838c8650ed0ef0e518a4f661cc969e6f.tar.gz
ngircd-8dadb17f838c8650ed0ef0e518a4f661cc969e6f.zip
- Changed "once"-server-config-flag into a generic flag.
- Changed semantics of "NGIRCd_Passive".
Diffstat (limited to 'src')
-rw-r--r--src/ngircd/conn.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 3975a920..8ef4bc7a 100644
--- a/src/ngircd/conn.c
+++ b/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 )