X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fopen.c;h=244dde7317c1008b69688591543c6c012d070444;hb=e4f2c9425afc0f594212aa1697bad779733b96b9;hp=9df35ac8885c5066500130ee374c0aa11f9dfc07;hpb=6442964059b02d0602b0aad71830969da47de4dc;p=openldap diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index 9df35ac888..244dde7317 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* Portions @@ -54,9 +54,11 @@ ldap_open( LDAP_CONST char *host, int port ) int rc; LDAP *ld; - Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "ldap_open(%s, %d)\n", + host, port, 0 ); - if (( ld = ldap_init( host, port )) == NULL ) { + ld = ldap_init( host, port ); + if ( ld == NULL ) { return( NULL ); } @@ -64,13 +66,13 @@ ldap_open( LDAP_CONST char *host, int port ) if( rc < 0 ) { ldap_ld_free( ld, 0, NULL, NULL ); - return( NULL ); + ld = NULL; } - Debug( LDAP_DEBUG_TRACE, "ldap_open successful, ld_host is %s\n", - ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "ldap_open: %s\n", + ld == NULL ? "succeeded" : "failed", 0, 0 ); - return( ld ); + return ld; } @@ -90,47 +92,13 @@ ldap_create( LDAP **ldp ) /* Initialize the global options, if not already done. */ if( gopts->ldo_valid != LDAP_INITIALIZED ) { ldap_int_initialize(gopts, NULL); + if ( gopts->ldo_valid != LDAP_INITIALIZED ) + return LDAP_LOCAL_ERROR; } Debug( LDAP_DEBUG_TRACE, "ldap_create\n", 0, 0, 0 ); -#ifdef HAVE_WINSOCK2 -{ WORD wVersionRequested; - WSADATA wsaData; - - wVersionRequested = MAKEWORD( 2, 0 ); - if ( WSAStartup( wVersionRequested, &wsaData ) != 0 ) { - /* Tell the user that we couldn't find a usable */ - /* WinSock DLL. */ - return LDAP_LOCAL_ERROR; - } - - /* Confirm that the WinSock DLL supports 2.0.*/ - /* Note that if the DLL supports versions greater */ - /* than 2.0 in addition to 2.0, it will still return */ - /* 2.0 in wVersion since that is the version we */ - /* requested. */ - - if ( LOBYTE( wsaData.wVersion ) != 2 || - HIBYTE( wsaData.wVersion ) != 0 ) - { - /* Tell the user that we couldn't find a usable */ - /* WinSock DLL. */ - WSACleanup( ); - return LDAP_LOCAL_ERROR; - } -} /* The WinSock DLL is acceptable. Proceed. */ - -#elif HAVE_WINSOCK -{ WSADATA wsaData; - if ( WSAStartup( 0x0101, &wsaData ) != 0 ) { - return LDAP_LOCAL_ERROR; - } -} -#endif - if ( (ld = (LDAP *) LDAP_CALLOC( 1, sizeof(LDAP) )) == NULL ) { - WSACleanup( ); return( LDAP_NO_MEMORY ); } @@ -158,14 +126,12 @@ ldap_create( LDAP **ldp ) if ( ld->ld_options.ldo_defludp == NULL ) { LDAP_FREE( (char*)ld ); - WSACleanup( ); return LDAP_NO_MEMORY; } if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) { ldap_free_urllist( ld->ld_options.ldo_defludp ); LDAP_FREE( (char*) ld ); - WSACleanup( ); return LDAP_NO_MEMORY; } @@ -175,7 +141,6 @@ ldap_create( LDAP **ldp ) if ( ld->ld_sb == NULL ) { ldap_free_urllist( ld->ld_options.ldo_defludp ); LDAP_FREE( (char*) ld ); - WSACleanup( ); return LDAP_NO_MEMORY; } @@ -234,6 +199,10 @@ ldap_initialize( LDAP **ldp, LDAP_CONST char *url ) ldap_ld_free(ld, 1, NULL, NULL); return rc; } +#ifdef LDAP_CONNECTIONLESS + if (ldap_is_ldapc_url(url)) + LDAP_IS_UDP(ld) = 1; +#endif } *ldp = ld; @@ -253,14 +222,14 @@ ldap_int_open_connection( int sasl_ssf = 0; #endif char *host; - int port; + int port, proto; long addr; Debug( LDAP_DEBUG_TRACE, "ldap_int_open_connection\n", 0, 0, 0 ); - switch ( ldap_pvt_url_scheme2proto( srv->lud_scheme ) ) { + switch ( proto = ldap_pvt_url_scheme2proto( srv->lud_scheme ) ) { case LDAP_PROTO_TCP: - port = htons( (short) srv->lud_port ); + port = srv->lud_port; addr = 0; if ( srv->lud_host == NULL || *srv->lud_host == 0 ) { @@ -270,8 +239,16 @@ ldap_int_open_connection( host = srv->lud_host; } - rc = ldap_connect_to_host( ld, conn->lconn_sb, 0, - host, addr, port, async ); + if( !port ) { + if( strcmp(srv->lud_scheme, "ldaps") == 0 ) { + port = LDAPS_PORT; + } else { + port = LDAP_PORT; + } + } + + rc = ldap_connect_to_host( ld, conn->lconn_sb, + proto, host, addr, port, async ); if ( rc == -1 ) return rc; @@ -286,13 +263,40 @@ ldap_int_open_connection( sasl_host = ldap_host_connected_to( conn->lconn_sb ); #endif break; +#ifdef LDAP_CONNECTIONLESS + + case LDAP_PROTO_UDP: + port = srv->lud_port; + + addr = 0; + if ( srv->lud_host == NULL || *srv->lud_host == 0 ) { + host = NULL; + addr = htonl( INADDR_LOOPBACK ); + } else { + host = srv->lud_host; + } + + if( !port ) port = LDAP_PORT; + + LDAP_IS_UDP(ld) = 1; + rc = ldap_connect_to_host( ld, conn->lconn_sb, + proto, host, addr, port, async ); + + if ( rc == -1 ) return rc; +#ifdef LDAP_DEBUG + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug, + LBER_SBIOD_LEVEL_PROVIDER, (void *)"udp_" ); +#endif + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_udp, + LBER_SBIOD_LEVEL_PROVIDER, NULL ); + break; +#endif case LDAP_PROTO_IPC: #ifdef LDAP_PF_LOCAL /* only IPC mechanism supported is PF_LOCAL (PF_UNIX) */ rc = ldap_connect_to_path( ld, conn->lconn_sb, srv->lud_host, async ); if ( rc == -1 ) return rc; - #ifdef LDAP_DEBUG ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug, LBER_SBIOD_LEVEL_PROVIDER, (void *)"ipc_" ); @@ -311,12 +315,6 @@ ldap_int_open_connection( break; } -#ifdef HAVE_CYRUS_SASL - if( sasl_host != NULL ) { - ldap_int_sasl_open( ld, conn, sasl_host, sasl_ssf ); - } -#endif - ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_readahead, LBER_SBIOD_LEVEL_PROVIDER, NULL ); @@ -325,12 +323,29 @@ ldap_int_open_connection( INT_MAX, (void *)"ldap_" ); #endif +#ifdef LDAP_CONNECTIONLESS + if( proto == LDAP_PROTO_UDP ) + return 0; +#endif + +#ifdef HAVE_CYRUS_SASL + /* establish Cyrus SASL context prior to starting TLS so + that SASL EXTERNAL might be used */ + if( sasl_host != NULL ) { + ldap_int_sasl_open( ld, conn, sasl_host, sasl_ssf ); + LDAP_FREE( sasl_host ); + } +#endif + #ifdef HAVE_TLS if (ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD || strcmp( srv->lud_scheme, "ldaps" ) == 0 ) { - rc = ldap_pvt_tls_start( ld, conn->lconn_sb, - ld->ld_options.ldo_tls_ctx ); + ++conn->lconn_refcnt; /* avoid premature free */ + + rc = ldap_int_tls_start( ld, conn, srv ); + + --conn->lconn_refcnt; if (rc != LDAP_SUCCESS) { return -1;