Commit b9678afd authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6037

parent 5b6f634c
......@@ -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)
......
......@@ -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;
}
......
......@@ -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 */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment