upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix previous commit

Browse source
This commit is contained in:
Pierangelo Masarati 2006-10-15 18:24:30 +00:00
parent b6525c14d9
commit 8567ce8eed
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
servers/slapd/daemon.c
View file

@ -1308,39 +1308,43 @@ slap_open_listener(
#ifdef LDAP_PF_LOCAL #ifdef LDAP_PF_LOCAL
case AF_LOCAL: case AF_LOCAL:
#ifdef LOCAL_CREDS #ifdef LOCAL_CREDS
{ {
int one = 1; int one = 1;
setsockopt( l.sl_sd, 0, LOCAL_CREDS, &one, sizeof( one ) ); setsockopt( l.sl_sd, 0, LOCAL_CREDS, &one, sizeof( one ) );
} }
#endif /* LOCAL_CREDS */ #endif /* LOCAL_CREDS */
addrlen = sizeof( struct sockaddr_un ); addrlen = sizeof( struct sockaddr_un );
break;
#endif /* LDAP_PF_LOCAL */
}
#ifdef LDAP_PF_LOCAL
/* create socket with all permissions set for those systems /* create socket with all permissions set for those systems
* that honor permissions on sockets (e.g. Linux); typically, * that honor permissions on sockets (e.g. Linux); typically,
* only write is required. To exploit filesystem permissions, * only write is required. To exploit filesystem permissions,
* place the socket in a directory and use directory's * place the socket in a directory and use directory's
* permissions. Need write perms to the directory to * permissions. Need write perms to the directory to
* create/unlink the socket; likely need exec perms to access * create/unlink the socket; likely need exec perms to access
* the socket */ * the socket (ITS#4709) */
{ {
mode_t old_umask; mode_t old_umask;
old_umask = umask( 0 ); old_umask = umask( 0 );
rc = bind( l.sl_sd, *sal, addrlen );
umask( old_umask );
if ( rc ) {
err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"daemon: bind(%ld) failed errno=%d (%s)\n",
(long)l.sl_sd, err, sock_errstr( err ) );
tcp_close( l.sl_sd );
sal++;
continue;
}
}
break;
#endif /* LDAP_PF_LOCAL */ #endif /* LDAP_PF_LOCAL */
rc = bind( l.sl_sd, *sal, addrlen );
#ifdef LDAP_PF_LOCAL
umask( old_umask );
}
#endif /* LDAP_PF_LOCAL */
if ( rc ) {
err = sock_errno();
Debug( LDAP_DEBUG_ANY,
"daemon: bind(%ld) failed errno=%d (%s)\n",
(long)l.sl_sd, err, sock_errstr( err ) );
tcp_close( l.sl_sd );
sal++;
continue;
} }
switch ( (*sal)->sa_family ) { switch ( (*sal)->sa_family ) {