New configuration option "NoZeroConf" to disable ZeroConf registration

[ngircd-alex.git] / src / ngircd / conf.c

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index a70973e78cf8b47d33eeac5cb54a27f8388e4fef..f8b470fa13e8e349ff54a84461783ef8afd7b551 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -324,6 +324,10 @@ Conf_Test( void )
                printf("  ServerGID = %s\n", grp->gr_name);
        else
                printf("  ServerGID = %ld\n", (long)Conf_GID);
+#ifdef SYSLOG
+       printf("  SyslogFacility = %s\n",
+              ngt_SyslogFacilityName(Conf_SyslogFacility));
+#endif
        printf("  PingTimeout = %d\n", Conf_PingTimeout);
        printf("  PongTimeout = %d\n", Conf_PongTimeout);
        printf("  ConnectRetry = %d\n", Conf_ConnectRetry);
@@ -334,6 +338,7 @@ Conf_Test( void )
        printf("  NoDNS = %s\n", yesno_to_str(Conf_NoDNS));
        printf("  NoIdent = %s\n", yesno_to_str(Conf_NoIdent));
        printf("  NoPAM = %s\n", yesno_to_str(Conf_NoPAM));
+       printf("  NoZeroConf = %s\n", yesno_to_str(Conf_NoZeroConf));
 
 #ifdef WANT_IPV6
        printf("  ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6));
@@ -583,6 +588,7 @@ Set_Defaults(bool InitServers)
        Conf_NoDNS = false;
        Conf_NoIdent = false;
        Conf_NoPAM = false;
+       Conf_NoZeroConf = false;
 
        Conf_Oper_Count = 0;
        Conf_Channel_Count = 0;
@@ -600,6 +606,14 @@ Set_Defaults(bool InitServers)
        Conf_MaxJoins = 10;
        Conf_MaxNickLength = CLIENT_NICK_LEN_DEFAULT;
 
+#ifdef SYSLOG
+#ifdef LOG_LOCAL5
+       Conf_SyslogFacility = LOG_LOCAL5;
+#else
+       Conf_SyslogFacility = 0;
+#endif
+#endif
+
        /* Initialize server configuration structures */
        if (InitServers) {
                for (i = 0; i < MAX_SERVERS;
@@ -1036,6 +1050,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                Conf_NoPAM = Check_ArgIsTrue(Arg);
                return;
        }
+       if(strcasecmp(Var, "NoZeroConf") == 0) {
+               /* don't register services using ZeroConf */
+               Conf_NoZeroConf = Check_ArgIsTrue(Arg);
+               return;
+       }
 #ifdef WANT_IPV6
        /* the default setting for all the WANT_IPV6 special options is 'true' */
        if( strcasecmp( Var, "ConnectIPv6" ) == 0 ) {
@@ -1147,6 +1166,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                Conf_SSLOptions.DHFile = strdup_warn( Arg );
                 return;
         }
+#endif
+#ifdef SYSLOG
+       if (strcasecmp(Var, "SyslogFacility") == 0) {
+               Conf_SyslogFacility = ngt_SyslogFacilityID(Arg,
+                                                          Conf_SyslogFacility);
+               return;
+       }
 #endif
        Config_Error(LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!",
                                                                NGIRCd_ConfFile, Line, Var);
@@ -1524,6 +1550,29 @@ va_dcl
 } /* Config_Error */
 
 
+#ifdef DEBUG
+
+GLOBAL void
+Conf_DebugDump(void)
+{
+       int i;
+
+       Log(LOG_DEBUG, "Configured servers:");
+       for (i = 0; i < MAX_SERVERS; i++) {
+               if (! Conf_Server[i].name[0])
+                       continue;
+               Log(LOG_DEBUG,
+                   " - %s: %s:%d, last=%ld, group=%d, flags=%d, conn=%d",
+                   Conf_Server[i].name, Conf_Server[i].host,
+                   Conf_Server[i].port, Conf_Server[i].lasttry,
+                   Conf_Server[i].group, Conf_Server[i].flags,
+                   Conf_Server[i].conn_id);
+       }
+} /* Conf_DebugDump */
+
+#endif
+
+
 static void
 Init_Server_Struct( CONF_SERVER *Server )
 {