upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Limit use of deprecated ldap_bind(3) to LDAPv2 KBIND

Browse source
This commit is contained in:
Kurt Zeilenga 2005-11-18 00:18:53 +00:00
parent 55c52c5c72
commit 2707ba1ddf
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
clients/tools/common.c
View file

@ -49,11 +49,9 @@
#include "common.h"
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
#if !LDAP_DEPRECATED
/*
* NOTE: we declare it here only because we want to keep supporting
* (how long?) ancient, deprecated LDAP_AUTH_KRB* auth methods
*/
/* Necessary for old LDAPv2 Kerberos Bind methods */
LDAP_F( int )
ldap_bind LDAP_P(( /* deprecated */
LDAP *ld,
@ -61,6 +59,7 @@ ldap_bind LDAP_P(( /* deprecated */
LDAP_CONST char *passwd,
int authmethod ));
#endif
#endif
int authmethod = -1;
char *binddn = NULL;
@ -788,6 +787,7 @@ tool_args( int argc, char **argv )
exit( EXIT_FAILURE );
}
}
if( protocol == LDAP_VERSION2 ) {
if( assertctl || authzid || manageDIT || manageDSAit ||
#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
@ -811,8 +811,9 @@ tool_args( int argc, char **argv )
exit( EXIT_FAILURE );
}
#endif
} else {
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
} else {
if ( authmethod == LDAP_AUTH_KRBV4 || authmethod == LDAP_AUTH_KRBV41 ) {
fprintf( stderr, "%s: -k/-K incompatible with LDAPv%d\n",
prog, protocol );
@ -979,10 +980,24 @@ tool_bind( LDAP *ld )
msgbuf[0] = 0;
msgid = ldap_bind( ld, binddn, passwd.bv_val, authmethod );
if ( msgid == -1 ) {
tool_perror( "ldap_bind", -1, NULL, NULL, NULL, NULL );
exit( EXIT_FAILURE );
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
if ( authmethod == LDAP_AUTH_KRBV4 || authmethod == LDAP_AUTH_KRBV41 ) {
msgid = ldap_bind( ld, binddn, passwd.bv_val, authmethod );
if ( msgid == -1 ) {
tool_perror( "ldap_bind", -1, NULL, NULL, NULL, NULL );
exit( EXIT_FAILURE );
}
} else
#endif
{
/* simple bind */
rc = ldap_sasl_bind( ld, binddn, LDAP_SASL_SIMPLE,
&passwd, NULL, NULL, &msgid );
if ( msgid == -1 ) {
tool_perror( "ldap_sasl_bind(SIMPLE)", rc,
NULL, NULL, NULL, NULL );
exit( EXIT_FAILURE );
}
}
if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) {