repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 28bbd7e27a44ff3c03f86aa6f17a578ad15ee498:
path_to: 
revision_to: 

commit 28bbd7e27a44ff3c03f86aa6f17a578ad15ee498
Author: Alexander Barton 
Date:   Sun Jan 9 14:31:18 2011 +0100

    Make NoZeroConf option work with Howl

diff --git a/src/ngircd/rendezvous.c b/src/ngircd/rendezvous.c

--- a/src/ngircd/rendezvous.c
+++ b/src/ngircd/rendezvous.c
@@ -107,6 +107,12 @@ GLOBAL void Rendezvous_Init( void )

 	int i;

+	for (i = 0; i < MAX_RENDEZVOUS; i++)
+		My_Rendezvous[i].Desc[0] = '\0';
+
+	if (!Conf_ZeroConf)
+		return;
+
 #ifdef HOWL
 	if( sw_discovery_init( &My_Discovery_Session ) != SW_OKAY )
 	{
@@ -122,8 +128,6 @@ GLOBAL void Rendezvous_Init( void )
 		exit( 1 );
 	}
 #endif
-
-	for( i = 0; i < MAX_RENDEZVOUS; i++ ) My_Rendezvous[i].Desc[0] = '\0';
 } /* Rendezvous_Init */


@@ -238,6 +242,9 @@ GLOBAL void Rendezvous_Handler( void )
 	/* Handle all Rendezvous stuff; this function must be called
 	 * periodically from the run loop of the main program */

+	if (!Conf_ZeroConf)
+		return;
+
 #ifdef APPLE
 	int i;
 	char buffer[MAX_MACH_MSG_SIZE];

-----END OF PAGE-----