From: Howard Chu <hyc@openldap.org>
Date: Thu, 11 May 2006 04:43:17 +0000 (+0000)
Subject: Fix for !LDAP_SYSLOG
X-Git-Tag: OPENLDAP_REL_ENG_2_4_1ALPHA~2^2~48
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6e751774c4e615060ebac9f184c597534449080f;p=openldap

Fix for !LDAP_SYSLOG
---

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index eb475f2f08..70f2ebe12d 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -160,6 +160,7 @@ struct option_helper {
 	{ BER_BVNULL, 0, NULL, NULL }
 };
 
+#if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG)
 #ifdef LOG_LOCAL4
 static int
 parse_syslog_user( const char *arg, int *syslogUser )
@@ -222,6 +223,7 @@ parse_syslog_level( const char *arg, int *levelp )
 
 	return 0;
 }
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
 
 int
 parse_debug_unknowns( char **unknowns, int *levelp )
@@ -447,12 +449,12 @@ int main( int argc, char **argv )
 #ifdef HAVE_CHROOT
 				"r:"
 #endif
-#ifdef LDAP_SYSLOG
+#if defined(LDAP_DEBUG) && defined(LDAP_SYSLOG)
 				"S:"
-#endif
 #ifdef LOG_LOCAL4
 				"l:"
 #endif
+#endif
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
 				"u:g:"
 #endif
@@ -570,7 +572,6 @@ int main( int argc, char **argv )
 				goto destroy;
 			}
 			break;
-#endif /* LDAP_DEBUG && LDAP_SYSLOG */
 
 #ifdef LOG_LOCAL4
 		case 'l':	/* set syslog local user */
@@ -579,6 +580,7 @@ int main( int argc, char **argv )
 			}
 			break;
 #endif
+#endif /* LDAP_DEBUG && LDAP_SYSLOG */
 
 #ifdef HAVE_CHROOT
 		case 'r':