upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-31 20:19:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#1985 fix: blind commit

Browse source
This commit is contained in:
Kurt Zeilenga 2002-07-27 07:37:04 +00:00
parent 2f9b89b4af
commit 1677f178ce
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
servers/slapd/back-shell/fork.c
View file

@ -119,17 +119,24 @@ make_surrogate_parent( void )
char control[CMSG_SPACE(sizeof(io))];
} control_un;
struct cmsghdr *cmptr;
# endif
/* clear msghdr */
memset( &msg, 0, sizeof msg );
# ifdef CMSG_SPACE
msg.msg_control = control_un.control;
msg.msg_controllen = sizeof(control_un.control);
# else
msg.msg_accrights = (caddr_t) io;
msg.msg_accrightslen = sizeof(io);
# endif
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_flags = 0;
switch( recvmsg( pair[p][1], &msg, MSG_WAITALL ) ) {
case -1:
if( errno == EINTR )
@ -259,6 +266,12 @@ forkandexec(
char control[CMSG_SPACE(sizeof(io))];
} control_un;
struct cmsghdr *cmptr;
# endif
/* clear msghdr */
memset( &msg, 0, sizeof msg );
# ifdef CMSG_SPACE
msg.msg_control = control_un.control;
msg.msg_controllen = sizeof(control_un.control);
cmptr = CMSG_FIRSTHDR(&msg);
@ -270,11 +283,12 @@ forkandexec(
msg.msg_accrights = (caddr_t) io;
msg.msg_accrightslen = sizeof(io);
# endif
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_flags = 0;
ldap_pvt_thread_mutex_lock( &shell_surrogate_index_mutex );
i = shell_surrogate_index ^= 1;
ldap_pvt_thread_mutex_unlock( &shell_surrogate_index_mutex );