/*
+ * 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.
*
#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>
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 ( ld->ld_sb.sb_sd == -1 ) {
+ /* 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 );
"NeedSocket" : ( lc->lconn_status ==
LDAP_CONNST_CONNECTING ) ? "Connecting" : "Connected" );
fprintf( stderr, " last used: %s\n",
- ldap_int_ctime( &lc->lconn_lastused, timebuf ));
+ ldap_pvt_ctime( &lc->lconn_lastused, timebuf ));
if ( !all ) {
break;
}
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;
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 */