Fix LDAP_CONNECTIONLESS code rot

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index 70666525cf147c5c52057c00b33ff6bf1eefa4f1..dbe1abdae4e7fe022b07d2475476b720b0b99ad9 100644 (file)
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -40,10 +40,10 @@ static int add_addr LDAP_P((
        LDAP *ld, struct sockaddr *sap ));
 static int cldap_result LDAP_P((
        LDAP *ld, int msgid, LDAPMessage **res,
-       struct cldap_retinfo *crip, char *base ));
+       struct cldap_retinfo *crip, const char *base ));
 static int cldap_parsemsg LDAP_P((
        LDAP *ld, int msgid, BerElement *ber,
-       LDAPMessage **res, char *base ));
+       LDAPMessage **res, const char *base ));
 
 /*
  * cldap_open - initialize and connect to an ldap server.  A magic cookie to
@@ -55,7 +55,7 @@ static int cldap_parsemsg LDAP_P((
  */
 
 LDAP *
-cldap_open( char *host, int port )
+cldap_open( LDAP_CONST char *host, int port )
 {
     int                s;
     unsigned long      address;
@@ -94,7 +94,7 @@ cldap_open( char *host, int port )
     ld->ld_cldapaddrs = NULL;
 
     if (ber_pvt_sb_set_io( &(ld->ld_sb), &ber_pvt_sb_io_udp, NULL )<0) {
-       ldap_ld_free(ld, 1 );
+       ldap_ld_free(ld, 1, NULL, NULL );
        return NULL;
     }
        
@@ -107,6 +107,8 @@ cldap_open( char *host, int port )
      * 'host' may be a space-separated list.
      */
     if ( host != NULL ) {
+       char *host_dup = LDAP_STRDUP( host );
+       host = host_dup;
        for ( ; host != NULL; host = p ) {
            if (( p = strchr( host, ' ' )) != NULL ) {
                for (*p++ = '\0'; *p == ' '; p++) {
@@ -130,7 +132,8 @@ cldap_open( char *host, int port )
                            (char *)hp->h_addr_list[ i ],
                            sizeof(sock.sin_addr.s_addr));
                    if ( add_addr( ld, (struct sockaddr *)&sock ) < 0 ) {
-                       ldap_ld_free( ld, 1 );
+                       ldap_ld_free( ld, 1, NULL, NULL );
+                       LDAP_FREE( host_dup );
                        DO_RETURN( NULL );
                    }
                }
@@ -138,7 +141,8 @@ cldap_open( char *host, int port )
            } else {
                sock.sin_addr.s_addr = address;
                if ( add_addr( ld, (struct sockaddr *)&sock ) < 0 ) {
-                   ldap_ld_free( ld, 1 );
+                   ldap_ld_free( ld, 1, NULL, NULL );
+                   LDAP_FREE( host_dup );
                    DO_RETURN( NULL );
                }
            }
@@ -147,11 +151,12 @@ cldap_open( char *host, int port )
                    ld->ld_host = LDAP_STRDUP( host );
            }
        }
+       LDAP_FREE( host_dup );
     } else {
        address = INADDR_LOOPBACK;
        sock.sin_addr.s_addr = htonl( address );
        if ( add_addr( ld, (struct sockaddr *)&sock ) < 0 ) {
-           ldap_ld_free( ld, 1 );
+           ldap_ld_free( ld, 1, NULL, NULL );
            DO_RETURN( NULL );
        }
     }
@@ -159,7 +164,7 @@ cldap_open( char *host, int port )
     if ( ld->ld_cldapaddrs == NULL
            || ( ld->ld_defconn = ldap_new_connection( ld, NULL, 1,0,0 )) == NULL
            ) {
-       ldap_ld_free( ld, 0 );
+       ldap_ld_free( ld, 0, NULL, NULL );
        DO_RETURN( NULL );
     }
 
@@ -184,7 +189,7 @@ cldap_open( char *host, int port )
 void
 cldap_close( LDAP *ld )
 {
-       ldap_ld_free( ld, 0 );
+       ldap_ld_free( ld, 0, NULL, NULL );
 }
 
 
@@ -197,13 +202,19 @@ cldap_setretryinfo( LDAP *ld, int tries, int timeout )
 
 
 int
-cldap_search_s( LDAP *ld, char *base, int scope, char *filter, char **attrs,
-       int attrsonly, LDAPMessage **res, char *logdn )
+cldap_search_s( LDAP *ld,
+       LDAP_CONST char *base,
+       int scope,
+       LDAP_CONST char *filter,
+       char **attrs,
+       int attrsonly,
+       LDAPMessage **res,
+       char *logdn )
 {
     int                                ret, msgid;
     struct cldap_retinfo       cri;
 
-    *res = NULLMSG;
+    *res = NULL;
 
     (void) memset( &cri, 0, sizeof( cri ));
 
@@ -274,7 +285,7 @@ add_addr( LDAP *ld, struct sockaddr *sap )
 
 static int
 cldap_result( LDAP *ld, int msgid, LDAPMessage **res,
-       struct cldap_retinfo *crip, char *base )
+       struct cldap_retinfo *crip, const char *base )
 {
     Sockbuf            *sb = &ld->ld_sb;
     BerElement         ber;
@@ -405,7 +416,7 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res,
 
 static int
 cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
-       LDAPMessage **res, char *base )
+       LDAPMessage **res, const char *base )
 {
     ber_tag_t  tag;
        ber_len_t       len;
@@ -416,7 +427,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
     struct berval      *bv;
 
     rc = LDAP_DECODING_ERROR;  /* pessimistic */
-    ldm = chain = prev = NULLMSG;
+    ldm = chain = prev = NULL;
     baselen = ( base == NULL ) ? 0 : strlen( base );
     bv = NULL;
 
@@ -526,6 +537,6 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 
     /* return chain, calling result2error if we got anything at all */
     *res = chain;
-    return(( *res == NULLMSG ) ? rc : ldap_result2error( ld, *res, 0 ));
+    return(( *res == NULL ) ? rc : ldap_result2error( ld, *res, 0 ));
 }
 #endif /* LDAP_CONNECTIONLESS */

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 084ff29599e1bf1ea453a0a126f009520f2b9af7..66ddb64ccc0689e91a81776121ea3a2316d70a0d 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -393,7 +393,7 @@ int ldap_append_referral( LDAP *ld, char **referralsp, char *s );
  * in result.c:
  */
 #ifdef LDAP_CONNECTIONLESS
-LDAP_F int cldap_getmsg        ( LDAP *ld, struct timeval *timeout, BerElement *ber );
+int cldap_getmsg( LDAP *ld, struct timeval *timeout, BerElement *ber );
 #endif
 
 /*

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 8b03df7697467b60834a69e9bf494f154526892f..e517a059ab23a8348741ff47208b468ddc2e988f 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -762,7 +762,14 @@ cldap_getmsg( LDAP *ld, struct timeval *timeout, BerElement *ber )
        ber_len_t       len;
 
        if ( ! ber_pvt_sb_data_ready(&ld->ld_sb) ) {
-               rc = ldap_select1( ld, timeout );
+               /* restored from ldap_select1() in result.c version 1.24 */
+               fd_set  readfds;
+               if ( ldap_int_tblsize == 0 )
+                       ldap_int_ip_init();
+               FD_ZERO( &readfds );
+               FD_SET( ber_pvt_sb_get_desc(&ld->ld_sb), &readfds );
+               rc = select( ldap_int_tblsize, &readfds, 0, 0, timeout );
+
                if ( rc == -1 || rc == 0 ) {
                        ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :
                            LDAP_TIMEOUT);

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 4fbe02e21ccb20d0de1ff9faf232f587552e1e1e..764bc2e6d72e0fbd456b05e9fae8089cb4a949e8 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -189,7 +189,7 @@ send_ldap_result(
 
 #ifdef LDAP_CONNECTIONLESS
        if ( op->o_cldap ) {
-               ber_pvt_sb_udp_set_dst( &conn->c_sb, &op->o_clientaddr );
+               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
                    &op->o_clientaddr)->sin_addr ),
@@ -216,7 +216,7 @@ send_ldap_disconnect(
 
 #ifdef LDAP_CONNECTIONLESS
        if ( op->o_cldap ) {
-               ber_pvt_sb_udp_set_dst( &conn->c_sb, &op->o_clientaddr );
+               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
                    &op->o_clientaddr)->sin_addr ),