X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fopen.c;h=e9a7353ab66b4a71db401d8f9f5f675795f5c10c;hb=c8e37af0ca8302c276e8c6af84eca4f926171261;hp=5792b92e0a5a6a41efc5308b776ef08e36eaaa26;hpb=ba0c0e022c151dc0db260e2a2b79e452000e87a2;p=openldap diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index 5792b92e0a..e9a7353ab6 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -12,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include @@ -24,6 +25,7 @@ #include "ldap-int.h" + /* * 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. @@ -35,12 +37,10 @@ */ 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 ); @@ -48,32 +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 )) { - if(srv != NULL) free( (char*) srv ); - 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 ); @@ -91,12 +82,12 @@ ldap_open( char *host, int 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 ); @@ -132,53 +123,57 @@ 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, &openldap_ldap_global_options, + memcpy(&ld->ld_options, &ldap_int_global_options, sizeof(ld->ld_options)); - /* but not pointers to malloc'ed strings */ + 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 = strdup( defhost ); + ld->ld_options.ldo_defhost = LDAP_STRDUP( defhost ); } else { - ld->ld_options.ldo_defhost = strdup( - openldap_ldap_global_options.ldo_defhost); + ld->ld_options.ldo_defhost = LDAP_STRDUP( + ldap_int_global_options.ldo_defhost); } if ( ld->ld_options.ldo_defhost == NULL ) { - free( (char*)ld ); + LDAP_FREE( (char*)ld ); WSACleanup( ); return( NULL ); } - if ( openldap_ldap_global_options.ldo_defbase != NULL ) { - ld->ld_options.ldo_defbase = strdup( - openldap_ldap_global_options.ldo_defbase); + if ( ldap_int_global_options.ldo_defbase != NULL ) { + ld->ld_options.ldo_defbase = LDAP_STRDUP( + ldap_int_global_options.ldo_defbase); } -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) { - free( (char*) ld->ld_options.ldo_defhost ); + LDAP_FREE( (char*) ld->ld_options.ldo_defhost ); if ( ld->ld_options.ldo_defbase == NULL ) { - free( (char*) ld->ld_options.ldo_defbase ); + LDAP_FREE( (char*) ld->ld_options.ldo_defbase ); } - free( (char*) ld ); + LDAP_FREE( (char*) ld ); WSACleanup( ); return( NULL ); } -#endif if(defport != 0) { ld->ld_defport = defport; @@ -196,19 +191,20 @@ ldap_init( char *defhost, int defport ) /* we'll assume we're talking version 2 for now */ ld->ld_version = LDAP_VERSION2; - ld->ld_sb.sb_sd = -1; + 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 ); @@ -224,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; } @@ -253,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;