From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 11 May 2007 23:04:33 +0000 (+0000)
Subject: Fix for !(LDAP_DEBUG && LDAP_SYSLOG)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~495
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dfc10014b116987579c6443527f177147c8860fd;p=openldap

Fix for !(LDAP_DEBUG && LDAP_SYSLOG)
---

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index ec33cf84da..8c890e506d 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -305,7 +305,7 @@ usage( char *name )
 		"\t-g group\tGroup (id or name) to run as\n"
 #endif
 		"\t-h URLs\t\tList of URLs to serve\n"
-#ifdef LOG_LOCAL4
+#ifdef SLAP_DEFAULT_SYSLOG_USER
 		"\t-l facility\tSyslog facility (default: LOCAL4)\n"
 #endif
 		"\t-n serverName\tService name\n"
@@ -348,7 +348,7 @@ int main( int argc, char **argv )
 #if defined(HAVE_CHROOT)
 	char *sandbox = NULL;
 #endif
-#ifdef LOG_LOCAL4
+#ifdef SLAP_DEFAULT_SYSLOG_USER
 	int syslogUser = SLAP_DEFAULT_SYSLOG_USER;
 #endif
 	
@@ -675,6 +675,7 @@ unhandled_option:;
 		if ( version > 1 ) goto stop;
 	}
 
+#if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG)
 	{
 		char *logName;
 #ifdef HAVE_EBCDIC
@@ -693,6 +694,7 @@ unhandled_option:;
 		free( logName );
 #endif
 	}
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
 
 	Debug( LDAP_DEBUG_ANY, "%s", Versionstr, 0, 0 );
 
diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 07bf6dc013..22a5593c00 100644
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -47,13 +47,13 @@ static FILE *leakfile;
 
 static LDIFFP dummy;
 
-#ifdef LDAP_SYSLOG
+#if defined(LDAP_SYSLOG) && defined(LDAP_DEBUG)
 int start_syslog;
 static char **syslog_unknowns;
 #ifdef LOG_LOCAL4
 static int syslogUser = SLAP_DEFAULT_SYSLOG_USER;
 #endif /* LOG_LOCAL4 */
-#endif /* LDAP_SYSLOG */
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
 
 static void
 usage( int tool, const char *progname )
@@ -165,7 +165,7 @@ parse_slapopt( void )
 	} else if ( strncasecmp( optarg, "authzDN", len ) == 0 ) {
 		ber_str2bv( p, 0, 1, &authzDN );
 
-#ifdef LDAP_SYSLOG
+#if defined(LDAP_SYSLOG) && defined(LDAP_DEBUG)
 	} else if ( strncasecmp( optarg, "syslog", len ) == 0 ) {
 		if ( parse_debug_level( p, &ldap_syslog, &syslog_unknowns ) ) {
 			return -1;
@@ -185,7 +185,7 @@ parse_slapopt( void )
 		}
 		start_syslog = 1;
 #endif /* LOG_LOCAL4 */
-#endif /* LDAP_SYSLOG */
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
 
 	} else {
 		return -1;
@@ -417,7 +417,7 @@ slap_tool_init(
 		}
 	}
 
-#ifdef LDAP_SYSLOG
+#if defined(LDAP_SYSLOG) && defined(LDAP_DEBUG)
 	if ( start_syslog ) {
 		char *logName;
 #ifdef HAVE_EBCDIC
@@ -436,7 +436,7 @@ slap_tool_init(
 		free( logName );
 #endif
 	}
-#endif /* LDAP_SYSLOG */
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
 
 	switch ( tool ) {
 	case SLAPADD:
@@ -523,7 +523,7 @@ slap_tool_init(
 			exit( EXIT_FAILURE );
 	}
 
-#ifdef LDAP_SYSLOG
+#if defined(LDAP_SYSLOG) && defined(LDAP_DEBUG)
 	if ( syslog_unknowns ) {
 		rc = parse_debug_unknowns( syslog_unknowns, &ldap_syslog );
 		ldap_charray_free( syslog_unknowns );