X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdaemon.c;h=e42565af46a7fc541a696d07c6ec4d69ffcafb7d;hb=331e6275418bda0735d4952f64d51518881d10a8;hp=fd1d84f8a9170295b0a00d99fdc998f5e3461116;hpb=956f1d16aa522da6f6506d9c8fe9ce0d9867678a;p=openldap diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index fd1d84f8a9..e42565af46 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -22,10 +22,13 @@ #ifdef HAVE_TCPD #include +#define SLAP_STRING_UNKNOWN STRING_UNKNOWN int allow_severity = LOG_INFO; int deny_severity = LOG_NOTICE; -#endif /* TCP Wrappers */ +#else /* ! TCP Wrappers */ +#define SLAP_STRING_UNKNOWN "unknown" +#endif /* ! TCP Wrappers */ #ifdef LDAP_PF_LOCAL #include @@ -104,7 +107,7 @@ void slapd_slp_init( const char* urls ) { if( strcmp( slapd_srvurls[i], "ldap:///" ) == 0) { char *host = ldap_pvt_get_fqdn( NULL ); if ( host != NULL ) { - slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i], + slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i], strlen( host ) + sizeof( LDAP_SRVTYPE_PREFIX ) ); strcpy( lutil_strcopy(slapd_srvurls[i], @@ -116,7 +119,7 @@ void slapd_slp_init( const char* urls ) { } else if ( strcmp( slapd_srvurls[i], "ldaps:///" ) == 0) { char *host = ldap_pvt_get_fqdn( NULL ); if ( host != NULL ) { - slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i], + slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i], strlen( host ) + sizeof( LDAPS_SRVTYPE_PREFIX ) ); strcpy( lutil_strcopy(slapd_srvurls[i], @@ -152,6 +155,8 @@ void slapd_slp_regreport( void slapd_slp_reg() { int i; + if( slapd_srvurls == NULL ) return; + for( i=0; slapd_srvurls[i] != NULL; i++ ) { if( strncmp( slapd_srvurls[i], LDAP_SRVTYPE_PREFIX, sizeof( LDAP_SRVTYPE_PREFIX ) - 1 ) == 0 || @@ -173,6 +178,8 @@ void slapd_slp_reg() { void slapd_slp_dereg() { int i; + if( slapd_srvurls == NULL ) return; + for( i=0; slapd_srvurls[i] != NULL; i++ ) { SLPDereg( slapd_hslp, slapd_srvurls[i], @@ -311,7 +318,7 @@ static void slap_free_listener_addresses(struct sockaddr **sal) ch_free(sal); } -#ifdef LDAP_PF_LOCAL +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) static int get_url_perms( char **exts, mode_t *perms, @@ -392,7 +399,7 @@ static int get_url_perms( return LDAP_OTHER; } -#endif /* LDAP_PF_LOCAL */ +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ /* port = 0 indicates AF_LOCAL */ static int slap_get_listener_addresses( @@ -587,13 +594,12 @@ static int slap_open_listener( struct sockaddr **sal, **psal; int socktype = SOCK_STREAM; /* default to COTS */ -#ifdef LDAP_PF_LOCAL +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) /* * use safe defaults */ - mode_t perms = S_IRWXU; int crit = 1; -#endif +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ rc = ldap_url_parse( url, &lud ); @@ -648,10 +654,6 @@ static int slap_open_listener( } else { err = slap_get_listener_addresses(lud->lud_host, 0, &sal); } - - if ( lud->lud_exts ) { - err = get_url_perms( lud->lud_exts, &perms, &crit ); - } #else #ifdef NEW_LOGGING @@ -665,9 +667,6 @@ static int slap_open_listener( return -1; #endif } else { -#ifdef LDAP_CONNECTIONLESS - l.sl_is_udp = ( tmp == LDAP_PROTO_UDP ); -#endif if( lud->lud_host == NULL || lud->lud_host[0] == '\0' || strcmp(lud->lud_host, "*") == 0 ) { @@ -676,6 +675,17 @@ static int slap_open_listener( err = slap_get_listener_addresses(lud->lud_host, port, &sal); } } +#ifdef LDAP_CONNECTIONLESS + l.sl_is_udp = ( tmp == LDAP_PROTO_UDP ); +#endif + +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) + if ( lud->lud_exts ) { + err = get_url_perms( lud->lud_exts, &l.sl_perms, &crit ); + } else { + l.sl_perms = S_IRWXU | S_IRWXO; + } +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ ldap_free_urldesc( lud ); if ( err ) { @@ -820,7 +830,8 @@ static int slap_open_listener( #ifdef LDAP_PF_LOCAL case AF_LOCAL: { char *addr = ((struct sockaddr_un *)*sal)->sun_path; - if ( chmod( addr, perms ) < 0 && crit ) { +#if 0 /* don't muck with socket perms */ + if ( chmod( addr, l.sl_perms ) < 0 && crit ) { int err = sock_errno(); #ifdef NEW_LOGGING LDAP_LOG( CONNECTION, INFO, @@ -834,6 +845,7 @@ static int slap_open_listener( slap_free_listener_addresses(psal); return -1; } +#endif l.sl_name.bv_len = strlen(addr) + sizeof("PATH=") - 1; l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len + 1 ); snprintf( l.sl_name.bv_val, l.sl_name.bv_len + 1, @@ -855,7 +867,7 @@ static int slap_open_listener( l.sl_name.bv_val = ber_memalloc( sizeof("IP=255.255.255.255:65535") ); snprintf( l.sl_name.bv_val, sizeof("IP=255.255.255.255:65535"), "IP=%s:%d", - s != NULL ? s : "unknown" , port ); + s != NULL ? s : SLAP_STRING_UNKNOWN, port ); l.sl_name.bv_len = strlen( l.sl_name.bv_val ); } break; @@ -1197,9 +1209,6 @@ slapd_daemon_task( fd_set writefds; Sockaddr from; -#if defined(SLAPD_RLOOKUPS) - struct hostent *hp; -#endif struct timeval zero; struct timeval *tvp; @@ -1377,6 +1386,9 @@ slapd_daemon_task( long id; slap_ssf_t ssf = 0; char *authid = NULL; +#ifdef SLAPD_RLOOKUPS + char hbuf[NI_MAXHOST]; +#endif char *dnsname = NULL; char *peeraddr = NULL; @@ -1549,6 +1561,19 @@ slapd_daemon_task( case AF_LOCAL: sprintf( peername, "PATH=%s", from.sa_un_addr.sun_path ); ssf = LDAP_PVT_SASL_LOCAL_SSF; + { + uid_t uid; + gid_t gid; + + if( getpeereid( s, &uid, &gid ) == 0 ) { + authid = ch_malloc( + sizeof("uidnumber=4294967295+gidnumber=4294967295," + "cn=peercred,cn=external,cn=auth")); + sprintf(authid, "uidnumber=%d+gidnumber=%d," + "cn=peercred,cn=external,cn=auth", + (int) uid, (int) gid); + } + } dnsname = "local"; break; #endif /* LDAP_PF_LOCAL */ @@ -1559,7 +1584,7 @@ slapd_daemon_task( peeraddr = inet_ntoa( *((struct in_addr *) &from.sa_in6_addr.sin6_addr.s6_addr[12]) ); sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); } else { char addr[INET6_ADDRSTRLEN]; @@ -1568,7 +1593,7 @@ slapd_daemon_task( &from.sa_in6_addr.sin6_addr, addr, sizeof addr ); sprintf( peername, "IP=%s %d", - peeraddr != NULL ? peeraddr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); } break; @@ -1577,7 +1602,7 @@ slapd_daemon_task( case AF_INET: peeraddr = inet_ntoa( from.sa_in_addr.sin_addr ); sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in_addr.sin_port ) ); break; @@ -1593,19 +1618,12 @@ slapd_daemon_task( ) { #ifdef SLAPD_RLOOKUPS if ( use_reverse_lookup ) { -# ifdef LDAP_PF_INET6 - if ( from.sa_addr.sa_family == AF_INET6 ) - hp = gethostbyaddr( - (char *)&(from.sa_in6_addr.sin6_addr), - sizeof(from.sa_in6_addr.sin6_addr), - AF_INET6 ); - else -# endif /* LDAP_PF_INET6 */ - hp = gethostbyaddr( - (char *) &(from.sa_in_addr.sin_addr), - sizeof(from.sa_in_addr.sin_addr), - AF_INET ); - dnsname = hp ? ldap_pvt_str2lower( hp->h_name ) : NULL; + char *herr; + if (ldap_pvt_get_hname( (const struct sockaddr *)&from, len, hbuf, + sizeof(hbuf), &herr ) == 0) { + ldap_pvt_str2lower( hbuf ); + dnsname = hbuf; + } } #else dnsname = NULL; @@ -1613,16 +1631,16 @@ slapd_daemon_task( #ifdef HAVE_TCPD if ( !hosts_ctl("slapd", - dnsname != NULL ? dnsname : STRING_UNKNOWN, - peeraddr != NULL ? peeraddr : STRING_UNKNOWN, - STRING_UNKNOWN )) + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, + SLAP_STRING_UNKNOWN )) { /* DENY ACCESS */ - Statslog( LDAP_DEBUG_ANY, - "fd=%ld host access from %s (%s) denied.\n", + Statslog( LDAP_DEBUG_STATS, + "fd=%ld DENIED from %s (%s)", (long) s, - dnsname != NULL ? dnsname : "unknown", - peeraddr != NULL ? peeraddr : "unknown", + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, 0, 0 ); slapd_close(s); continue; @@ -1632,7 +1650,7 @@ slapd_daemon_task( id = connection_init(s, slap_listeners[l], - dnsname != NULL ? dnsname : "unknown", + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, peername, #ifdef HAVE_TLS slap_listeners[l]->sl_is_tls, @@ -1665,8 +1683,7 @@ slapd_daemon_task( } Statslog( LDAP_DEBUG_STATS, - "daemon: conn=%ld fd=%ld connection from %s " - "(%s) accepted.\n", + "conn=%ld fd=%ld ACCEPT from %s (%s)\n", id, (long) s, peername, slap_listeners[l]->sl_name.bv_val, @@ -1891,11 +1908,17 @@ slapd_daemon_task( #endif } - if( slapd_gentle_shutdown != 2 ) + if( slapd_gentle_shutdown != 2 ) { close_listeners ( 0 ); + } + free ( slap_listeners ); slap_listeners = NULL; + if( !slapd_gentle_shutdown ) { + connections_shutdown(); + } + #ifdef NEW_LOGGING LDAP_LOG( CONNECTION, CRIT, "slapd_daemon_task: shutdown waiting for %d threads to terminate.\n",