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.
128 lines
3.1 KiB
C
128 lines
3.1 KiB
C
/*
|
|
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
*/
|
|
/* Portions
|
|
* Copyright (c) 1990 Regents of the University of Michigan.
|
|
* All rights reserved.
|
|
*
|
|
* bind.c
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <ac/socket.h>
|
|
#include <ac/string.h>
|
|
#include <ac/time.h>
|
|
|
|
#include "ldap-int.h"
|
|
|
|
|
|
/*
|
|
* ldap_bind - bind to the ldap server (and X.500). The dn and password
|
|
* of the entry to which to bind are supplied, along with the authentication
|
|
* method to use. The msgid of the bind request is returned on success,
|
|
* -1 if there's trouble. Note, the kerberos support assumes the user already
|
|
* has a valid tgt for now. ldap_result() should be called to find out the
|
|
* outcome of the bind request.
|
|
*
|
|
* Example:
|
|
* ldap_bind( ld, "cn=manager, o=university of michigan, c=us", "secret",
|
|
* LDAP_AUTH_SIMPLE )
|
|
*/
|
|
|
|
int
|
|
ldap_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd, int authmethod )
|
|
{
|
|
/*
|
|
* The bind request looks like this:
|
|
* BindRequest ::= SEQUENCE {
|
|
* version INTEGER,
|
|
* name DistinguishedName, -- who
|
|
* authentication CHOICE {
|
|
* simple [0] OCTET STRING -- passwd
|
|
#ifdef HAVE_KERBEROS
|
|
* krbv42ldap [1] OCTET STRING
|
|
* krbv42dsa [2] OCTET STRING
|
|
#endif
|
|
* }
|
|
* }
|
|
* all wrapped up in an LDAPMessage sequence.
|
|
*/
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "ldap_bind\n", 0, 0, 0 );
|
|
|
|
switch ( authmethod ) {
|
|
case LDAP_AUTH_SIMPLE:
|
|
return( ldap_simple_bind( ld, dn, passwd ) );
|
|
|
|
#ifdef HAVE_KERBEROS
|
|
case LDAP_AUTH_KRBV41:
|
|
return( ldap_kerberos_bind1( ld, dn ) );
|
|
|
|
case LDAP_AUTH_KRBV42:
|
|
return( ldap_kerberos_bind2( ld, dn ) );
|
|
#endif
|
|
|
|
default:
|
|
ld->ld_errno = LDAP_AUTH_UNKNOWN;
|
|
return( -1 );
|
|
}
|
|
}
|
|
|
|
/*
|
|
* ldap_bind_s - bind to the ldap server (and X.500). The dn and password
|
|
* of the entry to which to bind are supplied, along with the authentication
|
|
* method to use. This routine just calls whichever bind routine is
|
|
* appropriate and returns the result of the bind (e.g. LDAP_SUCCESS or
|
|
* some other error indication). Note, the kerberos support assumes the
|
|
* user already has a valid tgt for now.
|
|
*
|
|
* Examples:
|
|
* ldap_bind_s( ld, "cn=manager, o=university of michigan, c=us",
|
|
* "secret", LDAP_AUTH_SIMPLE )
|
|
* ldap_bind_s( ld, "cn=manager, o=university of michigan, c=us",
|
|
* NULL, LDAP_AUTH_KRBV4 )
|
|
*/
|
|
int
|
|
ldap_bind_s(
|
|
LDAP *ld,
|
|
LDAP_CONST char *dn,
|
|
LDAP_CONST char *passwd,
|
|
int authmethod )
|
|
{
|
|
Debug( LDAP_DEBUG_TRACE, "ldap_bind_s\n", 0, 0, 0 );
|
|
|
|
switch ( authmethod ) {
|
|
case LDAP_AUTH_SIMPLE:
|
|
return( ldap_simple_bind_s( ld, dn, passwd ) );
|
|
|
|
#ifdef HAVE_KERBEROS
|
|
case LDAP_AUTH_KRBV4:
|
|
return( ldap_kerberos_bind_s( ld, dn ) );
|
|
|
|
case LDAP_AUTH_KRBV41:
|
|
return( ldap_kerberos_bind1_s( ld, dn ) );
|
|
|
|
case LDAP_AUTH_KRBV42:
|
|
return( ldap_kerberos_bind2_s( ld, dn ) );
|
|
#endif
|
|
|
|
default:
|
|
return( ld->ld_errno = LDAP_AUTH_UNKNOWN );
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
|
|
void
|
|
ldap_set_rebind_proc( LDAP *ld, int (*rebindproc)( LDAP *ld, char **dnp,
|
|
char **passwdp, int *authmethodp, int freeit ))
|
|
{
|
|
ld->ld_rebindproc = rebindproc;
|
|
}
|
|
#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
|