+/* $OpenLDAP$ */
/*
+ * 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 <ac/stdlib.h>
+
+#include <ac/param.h>
#include <ac/socket.h>
#include <ac/string.h>
#include <ac/time.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
#include "ldap-int.h"
-#ifdef LDAP_DEBUG
-int ldap_debug;
-#endif
+int ldap_open_defconn( LDAP *ld )
+{
+ if (( ld->ld_defconn = ldap_new_connection( ld, ld->ld_options.ldo_defludp, 1,1,0 )) == NULL )
+ {
+ ld->ld_errno = LDAP_SERVER_DOWN;
+ return -1;
+ }
+
+ ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
+ return 0;
+}
/*
* ldap_open - initialize and connect to an ldap server. A magic cookie to
*/
LDAP *
-ldap_open( char *host, int port )
+ldap_open( LDAP_CONST char *host, int port )
{
+ int rc;
LDAP *ld;
-#ifdef LDAP_REFERRALS
- LDAPServer *srv;
-#endif /* LDAP_REFERRALS */
Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 );
return( NULL );
}
-#ifdef LDAP_REFERRALS
- if (( srv = (LDAPServer *)calloc( 1, sizeof( LDAPServer ))) ==
- NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
- strdup( ld->ld_defhost )) == NULL )) {
- ldap_ld_free( ld, 0 );
- 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 );
- return( NULL );
- }
- ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
+ rc = ldap_open_defconn( ld );
-#else /* LDAP_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 );
+ if( rc < 0 ) {
+ ldap_ld_free( ld, 0, NULL, NULL );
return( NULL );
}
-#endif /* LDAP_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_init( LDAP_CONST char *defhost, int defport )
+{
+ LDAP *ld;
+ int rc;
+
+ rc = ldap_create(&ld);
+ if ( rc != LDAP_SUCCESS )
+ return NULL;
+
+ if (defport != 0)
+ ld->ld_options.ldo_defport = defport;
+
+ if (defhost != NULL) {
+ rc = ldap_set_option(ld, LDAP_OPT_HOST_NAME, defhost);
+ if ( rc != LDAP_SUCCESS ) {
+ ldap_ld_free(ld, 1, NULL, NULL);
+ return NULL;
+ }
+ }
+
+ return( ld );
+}
+
+int
+ldap_create( LDAP **ldp )
{
LDAP *ld;
- if(!openldap_ldap_initialized) {
- openldap_ldap_initialize();
+ *ldp = NULL;
+ if( ldap_int_global_options.ldo_valid != LDAP_INITIALIZED ) {
+ ldap_int_initialize();
}
Debug( LDAP_DEBUG_TRACE, "ldap_init\n", 0, 0, 0 );
#ifdef HAVE_WINSOCK2
{ WORD wVersionRequested;
WSADATA wsaData;
- int err;
wVersionRequested = MAKEWORD( 2, 0 );
-
- err = WSAStartup( wVersionRequested, &wsaData );
- if ( err != 0 ) {
+ if ( WSAStartup( wVersionRequested, &wsaData ) != 0 ) {
/* Tell the user that we couldn't find a usable */
/* WinSock DLL. */
- return NULL;
+ return LDAP_LOCAL_ERROR;
}
/* Confirm that the WinSock DLL supports 2.0.*/
/* Tell the user that we couldn't find a usable */
/* WinSock DLL. */
WSACleanup( );
- return NULL;
+ return LDAP_LOCAL_ERROR;
}
} /* The WinSock DLL is acceptable. Proceed. */
#elif HAVE_WINSOCK
- if ( WSAStartup( 0x0101, &wsadata ) != 0 ) {
- return( NULL );
+{ WSADATA wsaData;
+ if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
+ return LDAP_LOCAL_ERROR;
}
+}
#endif
- if ( (ld = (LDAP *) calloc( 1, sizeof(LDAP) )) == NULL ) {
+ if ( (ld = (LDAP *) LDAP_CALLOC( 1, sizeof(LDAP) )) == NULL ) {
WSACleanup( );
- return( NULL );
+ return( LDAP_NO_MEMORY );
}
+
+ /* copy the global options */
+ memcpy(&ld->ld_options, &ldap_int_global_options,
+ sizeof(ld->ld_options));
-#ifdef LDAP_REFERRALS
- if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) {
- free( (char*)ld );
- WSACleanup( );
- return( NULL );
- }
+ ld->ld_valid = LDAP_VALID_SESSION;
- LDAP_BOOL_ZERO(&ld->ld_options);
- LDAP_BOOL_SET(&ld->ld_options, LDAP_BOOL_REFERRALS);
-#else
- LDAP_BOOL_ZERO(&ld->ld_options);
-#endif
+ /* but not pointers to malloc'ed items */
+ ld->ld_options.ldo_defludp = NULL;
+ ld->ld_options.ldo_sctrls = NULL;
+ ld->ld_options.ldo_cctrls = NULL;
+
+ ld->ld_options.ldo_defludp =
+ ldap_url_duplist(ldap_int_global_options.ldo_defludp);
- 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 );
+ if ( ld->ld_options.ldo_defludp == NULL ) {
+ LDAP_FREE( (char*)ld );
WSACleanup( );
- return( NULL );
+ 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;
+ }
- 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_REFERRALS
- LDAP_BOOL_SET(&ld->ld_options, 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 */
- return( ld );
+ /* we'll assume we're talking version 2 for now */
+ ld->ld_version = LDAP_VERSION2;
+
+ ber_pvt_sb_init( &(ld->ld_sb) );
+
+ *ldp = ld;
+ return LDAP_SUCCESS;
}
+int
+ldap_initialize( LDAP **ldp, LDAP_CONST char *url )
+{
+ int rc;
+ LDAP *ld;
+
+ *ldp = NULL;
+ rc = ldap_create(&ld);
+ if ( rc != LDAP_SUCCESS )
+ return rc;
+
+ if (url != NULL) {
+ rc = ldap_set_option(ld, LDAP_OPT_URI, url);
+ if ( rc != LDAP_SUCCESS ) {
+ ldap_ld_free(ld, 1, NULL, NULL);
+ return rc;
+ }
+ }
+
+ *ldp = ld;
+ return LDAP_SUCCESS;
+}
int
-open_ldap_connection( LDAP *ld, Sockbuf *sb, char *host, int defport,
+open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
char **krbinstancep, int async )
{
int rc = -1;
- int port;
- char *p, *q, *r;
- char *curhost, hostname[ 2*MAXHOSTNAMELEN ];
+ int port;
+ long addr;
Debug( LDAP_DEBUG_TRACE, "open_ldap_connection\n", 0, 0, 0 );
- defport = htons( (short) defport );
-
- if ( host != NULL ) {
- for ( p = host; p != NULL && *p != '\0'; p = q ) {
- if (( q = strchr( p, ' ' )) != NULL ) {
- strncpy( hostname, p, q - p );
- hostname[ q - p ] = '\0';
- curhost = hostname;
- while ( *q == ' ' ) {
- ++q;
- }
- } else {
- curhost = p; /* avoid copy if possible */
- q = NULL;
- }
-
- if (( r = strchr( curhost, ':' )) != NULL ) {
- if ( curhost != hostname ) {
- strcpy( hostname, curhost ); /* now copy */
- r = hostname + ( r - curhost );
- curhost = hostname;
- }
- *r++ = '\0';
- port = htons( (short) atoi( r ) );
- } else {
- port = defport;
- }
-
- if (( rc = ldap_connect_to_host( sb, curhost, 0L,
- port, async )) != -1 ) {
- break;
- }
- }
- } else {
- rc = ldap_connect_to_host( sb, NULL, htonl( INADDR_LOOPBACK ),
- defport, async );
- }
+ port = srv->lud_port;
+ if (port == 0)
+ port = ld->ld_options.ldo_defport;
+ port = htons( (short) port );
+ addr = 0;
+ if ( srv->lud_host == NULL )
+ addr = htonl( INADDR_LOOPBACK );
+
+ rc = ldap_connect_to_host( ld, sb, srv->lud_host, addr, port, async );
if ( rc == -1 ) {
return( rc );
}
-
+
+ ber_pvt_sb_set_io( sb, &ber_pvt_sb_io_tcp, NULL );
+
+#ifdef HAVE_TLS
+ if ( ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD
+ || srv->lud_ldaps != 0 )
+ {
+ /*
+ * Fortunately, the lib uses blocking io...
+ */
+ if ( ldap_pvt_tls_connect( sb, ld->ld_options.ldo_tls_ctx ) <
+ 0 ) {
+ return -1;
+ }
+ /* FIXME: hostname of server must be compared with name in
+ * certificate....
+ */
+ }
+#endif
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;
projects / openldap / blobdiff