ITS#1716 is_entry_subentr/ies/y/

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 55c8347967e36ab6f3834f64b28a16fe5d9b95f3..64865406e20e91f748e91a14f5bfebd8f69ac222 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -30,26 +30,14 @@ int deny_severity = LOG_NOTICE;
 
 #ifdef LDAP_PF_LOCAL
 #include <sys/stat.h>
+/* this should go in <ldap.h> as soon as it is accepted */
+#define LDAPI_MOD_URLEXT               "x-mod"
 #endif /* LDAP_PF_LOCAL */
 
 /* globals */
 time_t starttime;
 ber_socket_t dtblsize;
 
-typedef struct slap_listener {
-       char* sl_url;
-       char* sl_name;
-#ifdef HAVE_TLS
-       int             sl_is_tls;
-#endif
-#ifdef LDAP_CONNECTIONLESS
-       int     sl_is_udp;              /* UDP listener is also data port */
-#endif
-       ber_socket_t            sl_sd;
-       Sockaddr sl_sa;
-#define sl_addr        sl_sa.sa_in_addr
-} Listener;
-
 Listener **slap_listeners = NULL;
 
 #define SLAPD_LISTEN 10
@@ -317,6 +305,63 @@ static void slap_free_listener_addresses(struct sockaddr **sal)
        ch_free(sal);
 }
 
+#ifdef LDAP_PF_LOCAL
+static int get_url_perms(
+       char    **exts,
+       mode_t  *perms,
+       int     *crit )
+{
+       int     i;
+
+       assert( exts );
+       assert( perms );
+       assert( crit );
+
+       *crit = 0;
+       for ( i = 0; exts[ i ]; i++ ) {
+               char    *type = exts[ i ];
+               int     c = 0;
+
+               if ( type[ 0 ] == '!' ) {
+                       c = 1;
+                       type++;
+               }
+
+               if ( strncasecmp( type, LDAPI_MOD_URLEXT "=", sizeof(LDAPI_MOD_URLEXT "=") - 1 ) == 0 ) {
+                       char    *value = type + sizeof(LDAPI_MOD_URLEXT "=") - 1;
+                       mode_t  p = 0;
+                       int     j;
+
+                       if ( strlen(value) != 3 ) {
+                               return LDAP_OTHER;
+                       } 
+
+                       for ( j = 0; j < 3; j++ ) {
+                               static mode_t   m[ 3 ] 
+                                       = { S_IRWXU, S_IRWXG, S_IRWXO };
+
+                               switch ( value[ j ] ) {
+                               case 'w':
+                                       p |= m[ j ];
+                                       break;
+                               case '-':
+                                       break;
+                               default:
+                                       return LDAP_OTHER;
+                               }
+                       } 
+
+                       *crit = c;
+                       *perms = p;
+
+                       return LDAP_SUCCESS;
+               }
+       }
+
+       return LDAP_OTHER;
+}
+#endif /* LDAP_PF_LOCAL */
+
 /* port = 0 indicates AF_LOCAL */
 static int slap_get_listener_addresses(
        const char *host,
@@ -500,6 +545,10 @@ static Listener * slap_open_listener(
        int err, addrlen = 0;
        struct sockaddr **sal, **psal;
        int socktype = SOCK_STREAM;     /* default to COTS */
+#ifdef LDAP_PF_LOCAL
+       mode_t  perms = S_IRWXU;
+       int     crit = 1;
+#endif
 
        rc = ldap_url_parse( url, &lud );
 
@@ -553,6 +602,10 @@ static Listener * 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
@@ -707,7 +760,7 @@ static Listener * slap_open_listener(
 #ifdef LDAP_PF_LOCAL
        case AF_LOCAL: {
                char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-               if ( chmod( addr, S_IRWXU ) < 0 ) {
+               if ( chmod( addr, perms ) < 0 && crit ) {
                        int err = sock_errno();
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
@@ -736,7 +789,7 @@ static Listener * slap_open_listener(
 #else
                s = inet_ntoa( ((struct sockaddr_in *) *sal)->sin_addr );
 #endif
-               port = ((struct sockaddr_in *)*sal) ->sin_port;
+               port = ntohs( ((struct sockaddr_in *)*sal) ->sin_port );
                l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") );
                sprintf( l.sl_name, "IP=%s:%d",
                         s != NULL ? s : "unknown" , port );
@@ -747,7 +800,7 @@ static Listener * slap_open_listener(
                char addr[INET6_ADDRSTRLEN];
                inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr,
                           addr, sizeof addr);
-               port = ((struct sockaddr_in6 *)*sal)->sin6_port;
+               port = ntohs( ((struct sockaddr_in6 *)*sal)->sin6_port );
                l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") );
                sprintf( l.sl_name, "IP=%s %d", addr, port );
        } break;
@@ -1327,6 +1380,7 @@ slapd_daemon_task(
                        case AF_LOCAL:
                                sprintf( peername, "PATH=%s", from.sa_un_addr.sun_path );
                                ssf = LDAP_PVT_SASL_LOCAL_SSF;
+                               dnsname = "local";
                                break;
 #endif /* LDAP_PF_LOCAL */
 
@@ -1367,19 +1421,21 @@ slapd_daemon_task(
 #endif
                        ) {
 #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
+                                       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;
+                                       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;
+                               }
 #else
                                dnsname = NULL;
 #endif /* SLAPD_RLOOKUPS */
@@ -1834,3 +1890,7 @@ slap_sig_wake( int sig )
 void slapd_add_internal(ber_socket_t s) {
        slapd_add(s);
 }
+
+Listener ** slapd_get_listeners(void) {
+       return slap_listeners;
+}