Additional fix for ITS#4522. The "dn=" ist not optional.

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index b1724ed3a140502547e7dcbdbf4582746a85e33b..97fd9741b33ad862a9e28342952b2d039366ed27 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -339,9 +339,13 @@ static struct slap_daemon {
 static char** slapd_srvurls = NULL;
 static SLPHandle slapd_hslp = 0;
 int slapd_register_slp = 0;
+char *slapd_slp_attrs = NULL;
+
+static SLPError slapd_slp_cookie;
 
 void slapd_slp_init( const char* urls ) {
        int i;
+       SLPError err;
 
        slapd_srvurls = ldap_str2charray( urls, " " );
 
@@ -376,7 +380,12 @@ void slapd_slp_init( const char* urls ) {
        }
 
        /* open the SLP handle */
-       SLPOpen( "en", 0, &slapd_hslp );
+       err = SLPOpen( "en", 0, &slapd_hslp );
+
+       if (err != SLP_OK) {
+               Debug( LDAP_DEBUG_CONNS, "daemon: SLPOpen() failed with %ld\n",
+                       (long)err, 0, 0 );
+       }
 }
 
 void slapd_slp_deinit() {
@@ -394,11 +403,13 @@ void slapd_slp_regreport(
        SLPError errcode,
        void* cookie )
 {
-       /* empty report */
+       /* return the error code in the cookie */
+       *(SLPError*)cookie = errcode; 
 }
 
 void slapd_slp_reg() {
        int i;
+       SLPError err;
 
        if( slapd_srvurls == NULL ) return;
 
@@ -408,28 +419,41 @@ void slapd_slp_reg() {
                    strncmp( slapd_srvurls[i], LDAPS_SRVTYPE_PREFIX,
                                sizeof( LDAPS_SRVTYPE_PREFIX ) - 1 ) == 0 )
                {
-                       SLPReg( slapd_hslp,
+                       err = SLPReg( slapd_hslp,
                                slapd_srvurls[i],
                                SLP_LIFETIME_MAXIMUM,
                                "ldap",
-                               "",
-                               1,
+                                       (slapd_slp_attrs) ? slapd_slp_attrs : "",
+                                       SLP_TRUE,
                                slapd_slp_regreport,
-                               NULL );
+                                       &slapd_slp_cookie );
+
+                       if (err != SLP_OK || slapd_slp_cookie != SLP_OK) {
+                               Debug( LDAP_DEBUG_CONNS,
+                                       "daemon: SLPReg(%s) failed with %ld, cookie = %ld\n",
+                                       slapd_srvurls[i], (long)err, (long)slapd_slp_cookie );
+                       }       
                }
        }
 }
 
 void slapd_slp_dereg() {
        int i;
+       SLPError err;
 
        if( slapd_srvurls == NULL ) return;
 
        for( i=0; slapd_srvurls[i] != NULL; i++ ) {
-               SLPDereg( slapd_hslp,
+               err = SLPDereg( slapd_hslp,
                        slapd_srvurls[i],
                        slapd_slp_regreport,
-                       NULL );
+                               &slapd_slp_cookie );
+               
+               if (err != SLP_OK || slapd_slp_cookie != SLP_OK) {
+                       Debug( LDAP_DEBUG_CONNS,
+                               "daemon: SLPDereg(%s) failed with %ld, cookie = %ld\n",
+                               slapd_srvurls[i], (long)err, (long)slapd_slp_cookie );
+               }
        }
 }
 #endif /* HAVE_SLP */
@@ -807,7 +831,8 @@ static int slap_get_listener_addresses(
                        sap[i]->sa_family = AF_INET;
                        ((struct sockaddr_in *)sap[i])->sin_port = htons(port);
                        AC_MEMCPY( &((struct sockaddr_in *)sap[i])->sin_addr,
-                               he ? he->h_addr_list[i] : &in, sizeof(struct in_addr) );
+                               he ? (struct in_addr *)he->h_addr_list[i] : &in,
+                               sizeof(struct in_addr) );
                }
                sap[i] = NULL;
 #endif
@@ -1157,6 +1182,8 @@ int slapd_daemon_init( const char *urls )
        if( u == NULL || u[0] == NULL ) {
                Debug( LDAP_DEBUG_ANY, "daemon_init: no urls (%s) provided.\n",
                        urls, 0, 0 );
+               if ( u )
+                       ldap_charray_free( u );
                return -1;
        }
 
@@ -1703,7 +1730,7 @@ slapd_daemon_task(
                struct timeval          tv;
                struct timeval          *tvp;
 
-               struct timeval          *cat;
+               struct timeval          cat;
                time_t                          tdelta = 1;
                struct re_s*            rtask;
                now = slap_get_time();
@@ -1784,7 +1811,7 @@ slapd_daemon_task(
 
                ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
                rtask = ldap_pvt_runqueue_next_sched( &slapd_rq, &cat );
-               while ( cat && cat->tv_sec && cat->tv_sec <= now ) {
+               while ( rtask && cat.tv_sec && cat.tv_sec <= now ) {
                        if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) {
                                ldap_pvt_runqueue_resched( &slapd_rq, rtask, 0 );
                        } else {
@@ -1792,15 +1819,15 @@ slapd_daemon_task(
                                ldap_pvt_runqueue_resched( &slapd_rq, rtask, 0 );
                                ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
                                ldap_pvt_thread_pool_submit( &connection_pool,
-                                                                                       rtask->routine, (void *) rtask );
+                                       rtask->routine, (void *) rtask );
                                ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
                        }
                        rtask = ldap_pvt_runqueue_next_sched( &slapd_rq, &cat );
                }
                ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
 
-               if ( cat && cat->tv_sec ) {
-                       time_t diff = difftime( cat->tv_sec, now );
+               if ( rtask && cat.tv_sec ) {
+                       time_t diff = difftime( cat.tv_sec, now );
                        if ( diff == 0 ) diff = tdelta;
                        if ( tvp == NULL || diff < tv.tv_sec ) {
                                tv.tv_sec = diff;
@@ -1977,9 +2004,6 @@ slapd_daemon_task(
                                "daemon: write active on %d\n",
                                wd, 0, 0 );
 
-#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
-                       connection_write_activate( wd );
-#else
                        /*
                         * NOTE: it is possible that the connection was closed
                         * and that the stream is now inactive.
@@ -1995,7 +2019,6 @@ slapd_daemon_task(
                                        nrfds--;
                                }
                        }
-#endif
                }
 
                for ( i = 0; nrfds > 0; i++ ) {
@@ -2103,9 +2126,6 @@ slapd_daemon_task(
 
                                        waswrite = 1;
 
-#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
-                                       connection_write_activate( fd );
-#else
                                        /*
                                         * NOTE: it is possible that the connection was closed
                                         * and that the stream is now inactive.
@@ -2115,7 +2135,6 @@ slapd_daemon_task(
                                        if ( connection_write( fd ) < 0 ) {
                                                continue;
                                        }
-#endif
                                }
                                /* If event is a read or an error */
                                if( SLAP_EVENT_IS_READ( i ) || !waswrite ) {