mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-01-14 16:51:39 +00:00
parent d168b49464
commit da921ed175
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
servers/slapd/sasl.c
View File

@ -173,8 +173,7 @@ sasl_ap_lookup( Operation *op, SlapReply *rs )
Attribute *a; Attribute *a;
const char *text; const char *text;
int rc, i; int rc, i;
slap_callback *tmp = op->o_callback; lookup_info *sl = (lookup_info *)op->o_callback->sc_private;
lookup_info *sl = tmp->sc_private;
if (rs->sr_type != REP_SEARCH) return 0; if (rs->sr_type != REP_SEARCH) return 0;
@ -222,9 +221,9 @@ sasl_ap_lookup( Operation *op, SlapReply *rs )
for ( bv = a->a_vals; bv->bv_val; bv++ ) { for ( bv = a->a_vals; bv->bv_val; bv++ ) {
/* ITS#3846 don't give hashed passwords to SASL */ /* ITS#3846 don't give hashed passwords to SASL */
if ( ad == slap_schema.si_ad_userPassword && if ( ad == slap_schema.si_ad_userPassword &&
bv->bv_val[0] == '{' ) { bv->bv_val[0] == '{' /*}*/ )
rc = lutil_passwd_scheme( bv->bv_val ); {
if ( rc ) { if ( lutil_passwd_scheme( bv->bv_val ) ) {
/* If it's not a recognized scheme, just assume it's /* If it's not a recognized scheme, just assume it's
* a cleartext password that happened to include brackets. * a cleartext password that happened to include brackets.
* *
@ -234,11 +233,10 @@ sasl_ap_lookup( Operation *op, SlapReply *rs )
* past the scheme name, skip this value. * past the scheme name, skip this value.
*/ */
#ifdef SLAPD_CLEARTEXT #ifdef SLAPD_CLEARTEXT
if ( !strncasecmp( bv->bv_val, sc_cleartext.bv_val, if ( !ber_bvstrcasecmp( bv, &sc_cleartext ) ) {
sc_cleartext.bv_len )) {
struct berval cbv; struct berval cbv;
cbv.bv_len = bv->bv_len - sc_cleartext.bv_len; cbv.bv_len = bv->bv_len - sc_cleartext.bv_len;
if ( cbv.bv_len ) { if ( cbv.bv_len > 0 ) {
cbv.bv_val = bv->bv_val + sc_cleartext.bv_len; cbv.bv_val = bv->bv_val + sc_cleartext.bv_len;
sl->sparams->utils->prop_set( sl->sparams->propctx, sl->sparams->utils->prop_set( sl->sparams->propctx,
sl->list[i].name, cbv.bv_val, cbv.bv_len ); sl->list[i].name, cbv.bv_val, cbv.bv_len );
@ -372,6 +370,7 @@ slap_auxprop_lookup(
SlapReply rs = {REP_RESULT}; SlapReply rs = {REP_RESULT};
op.o_hdr = conn->c_sasl_bindop->o_hdr; op.o_hdr = conn->c_sasl_bindop->o_hdr;
op.o_tag = LDAP_REQ_SEARCH; op.o_tag = LDAP_REQ_SEARCH;
op.o_dn = conn->c_ndn;
op.o_ndn = conn->c_ndn; op.o_ndn = conn->c_ndn;
op.o_callback = &cb; op.o_callback = &cb;
slap_op_time( &op.o_time, &op.o_tincr ); slap_op_time( &op.o_time, &op.o_tincr );