Update ld->ld_errno if LDAP_DECODING_ERROR...

[openldap] / libraries / libldap / cldap.c

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index ec7ea7ee81dac6b4d4b172d88c6d0a2407ec743b..de6208136b3d5f89b6d1c0df4b3b531a6239c800 100644 (file)
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -40,10 +41,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 +56,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 +95,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 +108,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 +133,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 +142,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 +152,11 @@ 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 );
+       sock.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
        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,12 +285,13 @@ 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;
     char               *logdn;
-    int                        ret, id, fromaddr, i;
+    int                        ret, fromaddr, i;
+       ber_int_t       id;
     struct timeval     tv;
 
     fromaddr = -1;
@@ -404,16 +416,18 @@ 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 )
 {
-    unsigned long      tag, len;
-    int                        baselen, slen, rc;
+    ber_tag_t  tag;
+       ber_len_t       len;
+    int                        baselen, slen;
+       ber_tag_t       rc;
     char               *dn, *p, *cookie;
     LDAPMessage                *chain, *prev, *ldm;
     struct berval      *bv;
 
     rc = LDAP_DECODING_ERROR;  /* pessimistic */
-    ldm = chain = prev = NULLMSG;
+    ldm = chain = prev = NULL;
     baselen = ( base == NULL ) ? 0 : strlen( base );
     bv = NULL;
 
@@ -422,7 +436,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
            tag = ber_next_element( ber, &len, cookie )) {
        if (( ldm = (LDAPMessage *)LDAP_CALLOC( 1, sizeof(LDAPMessage)))
                == NULL || ( ldm->lm_ber = ldap_alloc_ber_with_options( ld ))
-               == NULLBER ) {
+               == NULL ) {
            rc = LDAP_NO_MEMORY;
            break;      /* return w/error*/
        }
@@ -437,8 +451,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
                break;  /* return w/error */
            }
 
-           if ( ber_printf( ldm->lm_ber, "to", tag, bv->bv_val,
-                   bv->bv_len ) == -1 ) {
+           if ( ber_printf( ldm->lm_ber, "tO", tag, bv ) == -1 ) {
                break;  /* return w/error */
            }
            ber_bvfree( bv );
@@ -446,7 +459,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
            rc = LDAP_SUCCESS;
 
        } else if ( tag == LDAP_RES_SEARCH_ENTRY ) {
-           if ( ber_scanf( ber, "{aO", &dn, &bv ) == LBER_ERROR ) {
+           if ( ber_scanf( ber, "{aO" /*}*/, &dn, &bv ) == LBER_ERROR ) {
                break;  /* return w/error */
            }
            Debug( LDAP_DEBUG_TRACE, "cldap_parsemsg entry %s\n", dn, 0, 0 );
@@ -480,7 +493,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
        } else {
            Debug( LDAP_DEBUG_TRACE, "cldap_parsemsg got unknown tag %lu\n",
                    tag, 0, 0 );
-           rc = LDAP_PROTOCOL_ERROR;
+           rc = LDAP_DECODING_ERROR;
            break;      /* return w/error */
        }
 
@@ -490,8 +503,8 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 
 #ifdef LDAP_DEBUG
        if ( ldap_debug & LDAP_DEBUG_PACKETS ) {
-           fprintf( stderr, "cldap_parsemsg add message id %d type %d:\n",
-                   ldm->lm_msgid, ldm->lm_msgtype  );
+           fprintf( stderr, "cldap_parsemsg add message id %ld type %ld:\n",
+                   (long) ldm->lm_msgid, (long) ldm->lm_msgtype  );
            ber_log_dump( LDAP_DEBUG_BER, ldap_debug, ldm->lm_ber, 1 );
        }
 #endif /* LDAP_DEBUG */
@@ -513,7 +526,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 
     /* dispose of any leftovers */
     if ( ldm != NULL ) {
-       if ( ldm->lm_ber != NULLBER ) {
+       if ( ldm->lm_ber != NULL ) {
            ber_free( ldm->lm_ber, 1 );
        }
        LDAP_FREE( ldm );
@@ -524,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 */