X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fopen.c;h=e9a7353ab66b4a71db401d8f9f5f675795f5c10c;hb=c8e37af0ca8302c276e8c6af84eca4f926171261;hp=fa383284b4159caed78ee2110212af88361ceed9;hpb=a48b606a2f977a17c617b141289c94c28507ff9c;p=openldap

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index fa383284b4..e9a7353ab6 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.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,12 +11,9 @@
 
 #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 <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -24,10 +25,6 @@ static char copyright[] = "@(#) Copyright (c) 1995 Regents of the University of
 
 #include "ldap-int.h"
 
-#ifdef LDAP_DEBUG
-int	ldap_debug;
-#endif
-
 
 /*
  * ldap_open - initialize and connect to an ldap server.  A magic cookie to
@@ -40,12 +37,10 @@ int	ldap_debug;
  */
 
 LDAP *
-ldap_open( char *host, int port )
+ldap_open( LDAP_CONST char *host, int port )
 {
 	LDAP		*ld;
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 	LDAPServer	*srv;
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 );
 
@@ -53,31 +48,23 @@ ldap_open( char *host, int port )
 		return( NULL );
 	}
 
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-	if (( srv = (LDAPServer *)calloc( 1, sizeof( LDAPServer ))) ==
+	if (( srv = (LDAPServer *)LDAP_CALLOC( 1, sizeof( LDAPServer ))) ==
 	    NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
-	    strdup( ld->ld_defhost )) == NULL )) {
-		ldap_ld_free( ld, 0 );
+	    LDAP_STRDUP( ld->ld_defhost )) == NULL )) {
+		if(srv != NULL) LDAP_FREE( (char*) srv );
+		ldap_ld_free( ld, 0, NULL, NULL );
 		return( NULL );
 	}
 	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 );
-		ldap_ld_free( ld, 0 );
+		if ( ld->ld_defhost != NULL ) LDAP_FREE( srv->lsrv_host );
+		LDAP_FREE( (char *)srv );
+		ldap_ld_free( ld, 0, NULL, NULL );
 		return( NULL );
 	}
 	++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 );
-		return( NULL );
-	}
-#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 );
 
@@ -88,19 +75,19 @@ ldap_open( char *host, int port )
 /*
  * 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_init( LDAP_CONST char *defhost, int defport )
 {
 	LDAP			*ld;
 
-	if(!openldap_ldap_initialized) {
-		openldap_ldap_initialize();
+	if( ldap_int_global_options.ldo_valid != LDAP_INITIALIZED ) {
+		ldap_int_initialize();
 	}
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_init\n", 0, 0, 0 );
@@ -136,48 +123,63 @@ ldap_init( char *defhost, int defport )
 }	/* The WinSock DLL is acceptable. Proceed. */
 
 #elif HAVE_WINSOCK
-	if ( WSAStartup( 0x0101, &wsadata ) != 0 ) {
+{	WSADATA wsaData;
+	if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
 	    return( NULL );
 	}
+}
 #endif
 
-	if ( (ld = (LDAP *) calloc( 1, sizeof(LDAP) )) == NULL ) {
+	if ( (ld = (LDAP *) LDAP_CALLOC( 1, sizeof(LDAP) )) == NULL ) {
 	    WSACleanup( );
 		return( NULL );
 	}
+   
+	/* copy the global options */
+	memcpy(&ld->ld_options, &ldap_int_global_options,
+		sizeof(ld->ld_options));
 
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-	if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) {
-		free( (char*)ld );
+	ld->ld_valid = LDAP_VALID_SESSION;
+
+	/* but not pointers to malloc'ed items */
+	ld->ld_options.ldo_defbase = NULL;
+	ld->ld_options.ldo_defhost = NULL;
+	ld->ld_options.ldo_sctrls = NULL;
+	ld->ld_options.ldo_cctrls = NULL;
+
+	if ( defhost != NULL ) {
+		ld->ld_options.ldo_defhost = LDAP_STRDUP( defhost );
+	} else {
+		ld->ld_options.ldo_defhost = LDAP_STRDUP(
+			ldap_int_global_options.ldo_defhost);
+	}
+
+	if ( ld->ld_options.ldo_defhost == NULL ) {
+		LDAP_FREE( (char*)ld );
 	    WSACleanup( );
 		return( NULL );
 	}
 
-	LDAP_BOOL_ZERO(&ld->ld_options);
-	LDAP_BOOL_SET(&ld->ld_options, LDAP_BOOL_REFERRALS);
-#else
-	LDAP_BOOL_ZERO(&ld->ld_options);
-#endif
+	if ( ldap_int_global_options.ldo_defbase != NULL ) {
+		ld->ld_options.ldo_defbase = LDAP_STRDUP(
+			ldap_int_global_options.ldo_defbase);
+	}
 
-	if ( defhost != NULL &&
-	    ( ld->ld_defhost = strdup( defhost )) == NULL ) {
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-		ldap_free_select_info( ld->ld_selectinfo );
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
-		free( (char*)ld );
+	if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) {
+		LDAP_FREE( (char*) ld->ld_options.ldo_defhost );
+		if ( ld->ld_options.ldo_defbase == NULL ) {
+			LDAP_FREE( (char*) ld->ld_options.ldo_defbase );
+		}
+		LDAP_FREE( (char*) ld );
 	    WSACleanup( );
 		return( NULL );
 	}
 
+	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_options.ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
-
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-	LDAP_BOOL_SET(&ld->ld_options, LDAP_BOOL_REFERRALS);
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
 #if defined( STR_TRANSLATION ) && defined( LDAP_DEFAULT_CHARSET )
 	ld->ld_lberoptions |= LBER_TRANSLATE_STRINGS;
@@ -186,18 +188,23 @@ ldap_init( char *defhost, int defport )
 #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;
+
+	ber_pvt_sb_init( &(ld->ld_sb) );
+
 	return( ld );
 }
 
 
 int
-open_ldap_connection( LDAP *ld, Sockbuf *sb, char *host, int defport,
+open_ldap_connection( LDAP *ld, Sockbuf *sb, const char *host, int defport,
 	char **krbinstancep, int async )
 {
 	int 			rc = -1;
 	int				port;
-	char			*p, *q, *r;
-	char			*curhost, hostname[ 2*MAXHOSTNAMELEN ];
+	const char		*p, *q;
+	char			*r, *curhost, hostname[ 2*MAXHOSTNAMELEN ];
 
 	Debug( LDAP_DEBUG_TRACE, "open_ldap_connection\n", 0, 0, 0 );
 
@@ -213,7 +220,7 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, char *host, int defport,
 				    ++q;
 				}
 			} else {
-				curhost = p;	/* avoid copy if possible */
+				curhost = (char *) p;	/* avoid copy if possible */
 				q = NULL;
 			}
 
@@ -242,12 +249,15 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, char *host, int defport,
 	if ( rc == -1 ) {
 		return( rc );
 	}
+   
+   	ber_pvt_sb_set_io( sb, &ber_pvt_sb_io_tcp, NULL );
 
 	if ( krbinstancep != NULL ) {
 #ifdef HAVE_KERBEROS
+		char *c;
 		if (( *krbinstancep = ldap_host_connected_to( sb )) != NULL &&
-		    ( p = strchr( *krbinstancep, '.' )) != NULL ) {
-			*p = '\0';
+		    ( c = strchr( *krbinstancep, '.' )) != NULL ) {
+			*c = '\0';
 		}
 #else /* HAVE_KERBEROS */
 		krbinstancep = NULL;