/*
+ * 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>
#include "ldap-int.h"
-#ifdef LDAP_DEBUG
-int ldap_debug;
-#endif
-
-
/*
* ldap_open - initialize and connect to an ldap server. A magic cookie to
* be used for future communication is returned on success, NULL on failure.
ldap_open( char *host, int port )
{
LDAP *ld;
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
LDAPServer *srv;
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 );
return( NULL );
}
-#ifdef LDAP_REFERRALS
+#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( (char*) srv );
ldap_ld_free( ld, 0 );
return( NULL );
}
}
++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
-#else /* LDAP_REFERRALS */
+#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 );
return( NULL );
}
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
Debug( LDAP_DEBUG_TRACE, "ldap_open successful, ld_host is %s\n",
( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 );
/*
* ldap_init - initialize the LDAP library. A magic cookie to be used for
* future communication is returned on success, NULL on failure.
- * "defhost" may be a space-separated list of hosts or IP addresses
+ * "host" may be a space-separated list of hosts or IP addresses
*
* Example:
* LDAP *ld;
- * ld = ldap_open( default_hostname, default_port );
+ * ld = ldap_open( host, port );
*/
LDAP *
ldap_init( char *defhost, int defport )
{
LDAP *ld;
+ if(!openldap_ldap_initialized) {
+ openldap_ldap_initialize();
+ }
+
Debug( LDAP_DEBUG_TRACE, "ldap_init\n", 0, 0, 0 );
#ifdef HAVE_WINSOCK2
return( NULL );
}
-#ifdef LDAP_REFERRALS
- if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) {
+ /* copy the global options */
+ memcpy(&ld->ld_options, &openldap_ldap_global_options,
+ sizeof(ld->ld_options));
+
+ /* but not pointers to malloc'ed strings */
+ ld->ld_options.ldo_defbase = NULL;
+ ld->ld_options.ldo_defhost = NULL;
+
+ if ( defhost != NULL ) {
+ ld->ld_options.ldo_defhost = strdup( defhost );
+ } else {
+ ld->ld_options.ldo_defhost = strdup(
+ openldap_ldap_global_options.ldo_defhost);
+ }
+
+ if ( ld->ld_options.ldo_defhost == NULL ) {
free( (char*)ld );
WSACleanup( );
return( NULL );
}
- LDAP_BOOL_ZERO(ld);
- LDAP_BOOL_SET(ld, LDAP_BOOL_REFERRALS);
-#else
- LDAP_BOOL_ZERO(ld);
-#endif
+ if ( openldap_ldap_global_options.ldo_defbase != NULL ) {
+ ld->ld_options.ldo_defbase = strdup(
+ openldap_ldap_global_options.ldo_defbase);
+ }
- if ( defhost != NULL &&
- ( ld->ld_defhost = strdup( defhost )) == NULL ) {
-#ifdef LDAP_REFERRALS
- ldap_free_select_info( ld->ld_selectinfo );
-#endif /* LDAP_REFERRALS */
- free( (char*)ld );
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+ if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) {
+ free( (char*) ld->ld_options.ldo_defhost );
+ if ( ld->ld_options.ldo_defbase == NULL ) {
+ free( (char*) ld->ld_options.ldo_defbase );
+ }
+ free( (char*) ld );
WSACleanup( );
return( NULL );
}
+#endif
+ if(defport != 0) {
+ ld->ld_defport = defport;
+ }
- ld->ld_defport = ( defport == 0 ) ? LDAP_PORT : defport;
- ld->ld_version = LDAP_VERSION;
ld->ld_lberoptions = LBER_USE_DER;
- ld->ld_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
-
-#ifdef LDAP_REFERRALS
- LDAP_BOOL_SET(ld, LDAP_BOOL_REFERRALS);
-#endif /* LDAP_REFERRALS */
#if defined( STR_TRANSLATION ) && defined( LDAP_DEFAULT_CHARSET )
ld->ld_lberoptions |= LBER_TRANSLATE_STRINGS;
#endif /* LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET */
#endif /* STR_TRANSLATION && LDAP_DEFAULT_CHARSET */
+ /* we'll assume we're talking version 2 for now */
+ ld->ld_version = LDAP_VERSION2;
+
+ ld->ld_sb.sb_sd = -1;
return( ld );
}