ITS#6037

diff --git a/CHANGES b/CHANGES
index b8a0f9822246906401a784d550787e35ea991e9e..d23def55eb0798f236492896079afe66f1b9a225 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.17 Engineering
        Fixed slapd normalization of updated schema attributes (ITS#5540)
+       Fixed slapd errno handling (ITS#6037)
        Build Environment
                Added test056-monitor (ITS#5540)
                Added test057-memberof-refint (ITS#5395)

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index fe87e196a4629a031e221c75bf981834214175eb..5d4cbf645af1c11d9eb95e3a606a98c6d3dcb715 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -2727,6 +2727,8 @@ sockdestroy( void )
 RETSIGTYPE
 slap_sig_shutdown( int sig )
 {
+       int save_errno = errno;
+
 #if 0
        Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: signal %d\n", sig, 0, 0);
 #endif
@@ -2755,15 +2757,21 @@ slap_sig_shutdown( int sig )
 
        /* reinstall self */
        (void) SIGNAL_REINSTALL( sig, slap_sig_shutdown );
+
+       errno = save_errno;
 }
 
 RETSIGTYPE
 slap_sig_wake( int sig )
 {
+       int save_errno = errno;
+
        WAKE_LISTENER(1);
 
        /* reinstall self */
        (void) SIGNAL_REINSTALL( sig, slap_sig_wake );
+
+       errno = save_errno;
 }
 
 

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index fa008ee2cff64d22bd77aa1d9b08ab38746e3e14..b22e8b70f139c65beb1c76d52e92689e134126ce 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -1056,13 +1056,12 @@ wait4child( int sig )
     int save_errno = errno;
 
 #ifdef WNOHANG
-    errno = 0;
+    do
+        errno = 0;
 #ifdef HAVE_WAITPID
-    while ( waitpid( (pid_t)-1, NULL, WNOHANG ) > 0 || errno == EINTR )
-       ;       /* NULL */
+    while ( waitpid( (pid_t)-1, NULL, WNOHANG ) > 0 || errno == EINTR );
 #else
-    while ( wait3( NULL, WNOHANG, NULL ) > 0 || errno == EINTR )
-       ;       /* NULL */
+    while ( wait3( NULL, WNOHANG, NULL ) > 0 || errno == EINTR );
 #endif
 #else
     (void) wait( NULL );
@@ -1072,4 +1071,3 @@ wait4child( int sig )
 }
 
 #endif /* LDAP_SIGCHLD */
-