mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
dc07e765f2
This commit includes many changes. All changes compile under NT but have not been tested under UNIX. A Summary of changes (likely incomplete): NT changes: Removed lint. Clean up configuration support for "Debug", "Release", "SDebug", and "SRelease" configurations. Share output directories for clients, libraries, and slapd. (maybe they should be combined further and moved to build/{,S}{Debug,Release}). Enable threading when _MT is defined. Enable debuging when _DEBUG is defined. Disable setting of NDEBUG under Release/SRelease. Asserts are disabled in <ac/assert.h> when LDAP_DEBUG is not defined. Added 'build/main.dsp' Master project. Removed non-slapd projects from slapd.dsp (see main.dsp). Removed replaced many uses of _WIN32 macro with feature based macros. ldap_cdefs.h changes #define LDAP_CONST const (see below) #define LDAP_F(type) LDAP_F_PRE type LDAP_F_POST To allow specifiers to be added before and after the type declaration. (For DLL handling) LBER/LDAP changes Namespace changes: s/lber_/ber_/ for here and there. s/NAME_ERROR/LDAP_NAME_ERROR/g Deleted NULLMSG and other NULL* macros for namespace reasons. "const" libraries. Installed headers (ie: lber.h, ldap.h) use LDAP_CONST macro. Normally set to 'const' when __STDC__. Can be set externally to enable/disable 'constification' of external interface. Internal interface always uses 'const'. Did not fix warnings in -lldif (in lieu of new LDIF parser). Added _ext API implementations (excepting search and bind). Need to implement ldap_int_get_controls() for reponses with controls. Added numberous assert() checks. LDAP_R _MT defines HAVE_NT_THREADS Added numberous assert() checks. Changed ldap_pthread_t back to unsigned long. Used cast to HANDLE in _join(). LDBM Replaced _WIN32 with HAVE_SYSLOG ud Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). slapd Made connection sockbuf field a pointer to a sockbuf. This removed slap.h dependency on lber-int.h. lber-int.h now only included by those files needing to mess with the sockbuf. Used ber_* functions/macros to access sockbuf internals whenever possible. Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). Removed FD_SET unsigned lint slapd/tools Used EXEEXT to added ".exe" to routines. Need to define EXEEXT under UNIX. ldappasswd Added ldappasswd.dsp. Ported to NT. Used getpid() to seed rand(). nt_debug Minor cleanup. Added "portable.h" include and used <ac/*.h> where appropriate. Added const to char* format argument.
276 lines
6.6 KiB
C
276 lines
6.6 KiB
C
/*
|
|
* 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.
|
|
*
|
|
* open.c
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.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"
|
|
|
|
|
|
/*
|
|
* 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.
|
|
* "host" may be a space-separated list of hosts or IP addresses
|
|
*
|
|
* Example:
|
|
* LDAP *ld;
|
|
* ld = ldap_open( hostname, port );
|
|
*/
|
|
|
|
LDAP *
|
|
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 );
|
|
|
|
if (( ld = ldap_init( host, port )) == NULL ) {
|
|
return( NULL );
|
|
}
|
|
|
|
#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, 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, 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, NULL, NULL );
|
|
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 );
|
|
|
|
return( ld );
|
|
}
|
|
|
|
|
|
/*
|
|
* ldap_init - initialize the LDAP library. A magic cookie to be used for
|
|
* future communication is returned on success, NULL on failure.
|
|
* "host" may be a space-separated list of hosts or IP addresses
|
|
*
|
|
* Example:
|
|
* LDAP *ld;
|
|
* ld = ldap_open( host, port );
|
|
*/
|
|
LDAP *
|
|
ldap_init( LDAP_CONST 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
|
|
{ WORD wVersionRequested;
|
|
WSADATA wsaData;
|
|
int err;
|
|
|
|
wVersionRequested = MAKEWORD( 2, 0 );
|
|
|
|
err = WSAStartup( wVersionRequested, &wsaData );
|
|
if ( err != 0 ) {
|
|
/* Tell the user that we couldn't find a usable */
|
|
/* WinSock DLL. */
|
|
return NULL;
|
|
}
|
|
|
|
/* 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 NULL;
|
|
}
|
|
} /* The WinSock DLL is acceptable. Proceed. */
|
|
|
|
#elif HAVE_WINSOCK
|
|
{ WSADATA wsaData;
|
|
if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
|
|
return( NULL );
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if ( (ld = (LDAP *) calloc( 1, sizeof(LDAP) )) == NULL ) {
|
|
WSACleanup( );
|
|
return( 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 );
|
|
}
|
|
|
|
if ( openldap_ldap_global_options.ldo_defbase != NULL ) {
|
|
ld->ld_options.ldo_defbase = strdup(
|
|
openldap_ldap_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 );
|
|
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_lberoptions = LBER_USE_DER;
|
|
|
|
#if defined( STR_TRANSLATION ) && defined( LDAP_DEFAULT_CHARSET )
|
|
ld->ld_lberoptions |= LBER_TRANSLATE_STRINGS;
|
|
#if LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET
|
|
ldap_set_string_translators( ld, ldap_8859_to_t61, ldap_t61_to_8859 );
|
|
#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, const char *host, int defport,
|
|
char **krbinstancep, int async )
|
|
{
|
|
int rc = -1;
|
|
int port;
|
|
const char *p, *q;
|
|
char *r, *curhost, hostname[ 2*MAXHOSTNAMELEN ];
|
|
|
|
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 = (char *) 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 );
|
|
}
|
|
|
|
if ( rc == -1 ) {
|
|
return( rc );
|
|
}
|
|
|
|
ber_pvt_sb_set_io( sb, &ber_pvt_sb_io_tcp, NULL );
|
|
|
|
if ( krbinstancep != NULL ) {
|
|
#ifdef HAVE_KERBEROS
|
|
if (( *krbinstancep = ldap_host_connected_to( sb )) != NULL &&
|
|
( p = strchr( *krbinstancep, '.' )) != NULL ) {
|
|
*p = '\0';
|
|
}
|
|
#else /* HAVE_KERBEROS */
|
|
krbinstancep = NULL;
|
|
#endif /* HAVE_KERBEROS */
|
|
}
|
|
|
|
return( 0 );
|
|
}
|