Cast char* argument to hh_to_c() to Byte*

[openldap] / libraries / libldap / request.c

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index f2d290e876286e219eeb7e3bf031cc382bdd21a9..5b8ecc8c5e45a0d4028f7b2f7a8288a95f348e85 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1995 Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -7,10 +11,6 @@
 
 #include "portable.h"
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1995 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -21,6 +21,7 @@ static char copyright[] = "@(#) Copyright (c) 1995 Regents of the University of
 #include <ac/unistd.h>
 
 #include "ldap-int.h"
+#include "lber.h"
 
 #if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) || defined( LDAP_API_FEATURE_X_OPENLDAP_V2_DNS )
 static LDAPConn *find_connection LDAP_P(( LDAP *ld, LDAPServer *srv, int any ));
@@ -75,12 +76,54 @@ ldap_send_initial_request( LDAP *ld, unsigned long msgtype, char *dn,
        BerElement *ber )
 {
 #if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) || defined( LDAP_API_FEATURE_X_OPENLDAP_V2_DNS )
-       LDAPServer      *servers;
+       LDAPServer      *servers, *srv;
 #endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS || LDAP_API_FEATURE_X_OPENLDAP_V2_DNS */
 
        Debug( LDAP_DEBUG_TRACE, "ldap_send_initial_request\n", 0, 0, 0 );
 
+       if ( ! lber_pvt_sb_in_use(&ld->ld_sb ) ) {
+               /* not connected yet */
+
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+               if (( srv = (LDAPServer *)calloc( 1, sizeof( LDAPServer ))) ==
+                   NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
+                   strdup( ld->ld_defhost )) == NULL ))
+               {
+                       if (srv != NULL) free( srv );
+                       ld->ld_errno = LDAP_NO_MEMORY;
+                       return( -1 );
+               }
+
+               srv->lsrv_port = ld->ld_defport;
+
+               if (( ld->ld_defconn = ldap_new_connection( ld, &srv, 1,1,0 ))
+                       == NULL )
+               {
+                       if ( ld->ld_defhost != NULL ) free( srv->lsrv_host );
+                       free( (char *)srv );
+                       ld->ld_errno = LDAP_SERVER_DOWN;
+                       return( -1 );
+               }
+               ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
+
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+               if ( open_ldap_connection( ld, &ld->ld_sb, ld->ld_defhost,
+                   ld->ld_defport, &ld->ld_host, 0 ) < 0 )
+               {
+                       ldap_ld_free( ld, 0 );
+                       ld->ld_errno = LDAP_SERVER_DOWN;
+                       return( -1 );
+               }
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+               Debug( LDAP_DEBUG_TRACE,
+                       "ldap_delayed_open successful, ld_host is %s\n",
+                       ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 );
+       }
+
+
 #if !defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) && !defined( LDAP_API_FEATURE_X_OPENLDAP_V2_DNS )
+
        if ( ber_flush( &ld->ld_sb, ber, 1 ) != 0 ) {
                ld->ld_errno = LDAP_SERVER_DOWN;
                return( -1 );
@@ -254,8 +297,7 @@ ldap_new_connection( LDAP *ld, LDAPServer **srvlistp, int use_ldsb,
         * XXX open connection synchronously for now
         */
        if (( lc = (LDAPConn *)calloc( 1, sizeof( LDAPConn ))) == NULL ||
-           ( !use_ldsb && ( sb = (Sockbuf *)calloc( 1, sizeof( Sockbuf )))
-           == NULL )) {
+           ( !use_ldsb && ( (sb = lber_pvt_sb_alloc()) == NULL ))) {
                if ( lc != NULL ) {
                        free( (char *)lc );
                }
@@ -279,7 +321,7 @@ ldap_new_connection( LDAP *ld, LDAPServer **srvlistp, int use_ldsb,
 
                if ( srv == NULL ) {
                    if ( !use_ldsb ) {
-                       free( (char *)lc->lconn_sb );
+                       lber_pvt_sb_free( lc->lconn_sb );
                    }
                    free( (char *)lc );
                    ld->ld_errno = LDAP_SERVER_DOWN;
@@ -309,7 +351,7 @@ ldap_new_connection( LDAP *ld, LDAPServer **srvlistp, int use_ldsb,
 
                freepasswd = err = 0;
 
-               if ( ld->ld_rebindproc == NULL ) {
+               if ( ld->ld_rebindproc == 0 ) {
                        binddn = passwd = "";
                        authmethod = LDAP_AUTH_SIMPLE;
                } else {
@@ -402,9 +444,8 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
                                ldap_send_unbind( ld, lc->lconn_sb );
                        }
                        ldap_close_connection( lc->lconn_sb );
-                       if ( lc->lconn_sb->sb_ber.ber_buf != NULL ) {
-                               free( lc->lconn_sb->sb_ber.ber_buf );
-                       }
+                       lber_pvt_sb_destroy( lc->lconn_sb );
+                       ber_clear( &lc->lconn_ber, 1 );
                }
                prevlc = NULL;
                for ( tmplc = ld->ld_conns; tmplc != NULL;
@@ -424,7 +465,7 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
                        free( lc->lconn_krbinstance );
                }
                if ( lc->lconn_sb != &ld->ld_sb ) {
-                       free( (char *)lc->lconn_sb );
+                       lber_pvt_sb_free( lc->lconn_sb );
                }
                free( lc );
                Debug( LDAP_DEBUG_TRACE, "ldap_free_connection: actually freed\n",
@@ -442,6 +483,7 @@ void
 ldap_dump_connection( LDAP *ld, LDAPConn *lconns, int all )
 {
        LDAPConn        *lc;
+       char            timebuf[32];
 
        fprintf( stderr, "** Connection%s:\n", all ? "s" : "" );
        for ( lc = lconns; lc != NULL; lc = lc->lconn_next ) {
@@ -457,7 +499,7 @@ ldap_dump_connection( LDAP *ld, LDAPConn *lconns, int all )
                    "NeedSocket" : ( lc->lconn_status ==
                    LDAP_CONNST_CONNECTING ) ? "Connecting" : "Connected" );
                fprintf( stderr, "  last used: %s\n",
-                   ctime( &lc->lconn_lastused ));
+                   ldap_pvt_ctime( &lc->lconn_lastused, timebuf ));
                if ( !all ) {
                        break;
                }
@@ -685,7 +727,7 @@ ldap_chase_referrals( LDAP *ld, LDAPRequest *lr, char **errstrp, int *hadrefp )
                                return( -1 );
                        }
 
-                       if (( srv->lsrv_host = ldap_strdup( tmpref )) == NULL ) {
+                       if (( srv->lsrv_host = strdup( tmpref )) == NULL ) {
                                free( (char *)srv );
                                ber_free( ber, 1 );
                                ld->ld_errno = LDAP_NO_MEMORY;
@@ -833,7 +875,7 @@ re_encode_request( LDAP *ld, BerElement *origber, int msgid, char **dnp )
        if ( ldap_debug & LDAP_DEBUG_PACKETS ) {
                Debug( LDAP_DEBUG_ANY, "re_encode_request new request is:\n",
                    0, 0, 0 );
-               ber_dump( ber, 0 );
+               lber_log_dump( LDAP_DEBUG_BER, ldap_debug, ber, 0 );
        }
 #endif /* LDAP_DEBUG */
 
@@ -919,9 +961,9 @@ dn2servers( LDAP *ld, char *dn )    /* dn can also be a domain.... */
                        prevsrv = srv;
                        
                        /* copy in info. */
-                       if (( srv->lsrv_host = ldap_strdup( host )) == NULL ||
+                       if (( srv->lsrv_host = strdup( host )) == NULL ||
                            ( server_dn != NULL && ( srv->lsrv_dn =
-                           ldap_strdup( server_dn )) == NULL )) {
+                           strdup( server_dn )) == NULL )) {
                                free_servers( srvlist );
                                srvlist = NULL;
                                break;          /* exit loop & return */