From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 21 Jun 2003 19:22:58 +0000 (+0000)
Subject: Fixed slapd compilation bug (ITS#2605)
X-Git-Tag: OPENLDAP_REL_ENG_2_1_22~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc0fa7b23214b78e1873033c0246d8a4b20e6c1a;p=thirdparty%2Fopenldap.git

Fixed slapd compilation bug (ITS#2605)
---

diff --git a/CHANGES b/CHANGES
index 542feb57d8..140df9fae1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.1.22 Engineering
 	Fixed slappasswd usage help (ITS#2565)
 	Build Environment
 		Fixed back-ldap/meta conflict (ITS#2608)
+		Fixed slapd compilation bug (ITS#2605)
 
 OpenLDAP 2.1.21 Release
 	Fixed liblber ber_get_next trickle bug (ITS#2490)
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index b4448fe77b..a035144c9c 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -2029,19 +2029,19 @@ slap_sig_shutdown( int sig )
 	 * SIGBREAK is generated when a user logs out.
 	 */
 
+#if 0
 #if HAVE_NT_SERVICE_MANAGER && SIGBREAK
 	if (is_NT_Service && sig == SIGBREAK)
-#if 0
 #ifdef NEW_LOGGING
 	    LDAP_LOG( CONNECTION, CRIT,
 		    "slap_sig_shutdown: SIGBREAK ignored.\n", 0, 0, 0 );
 #else
 	    Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: SIGBREAK ignored.\n",
 		  0, 0, 0);
-#endif
 #endif
 	else
 #endif
+#endif
 #ifdef SIGHUP
 	if (sig == SIGHUP && global_gentlehup && slapd_gentle_shutdown == 0)
 		slapd_gentle_shutdown = 1;