/* passwd.c - ldbm backend password routines */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
struct berval **rspdata,
LDAPControl *** rspctrls,
const char **text,
- struct berval *** refs
+ BerVarray *refs
)
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
int rc;
Entry *e = NULL;
- struct berval *hash = NULL;
+ struct berval hash = { 0, NULL };
- struct berval *id = NULL;
- struct berval *new = NULL;
+ struct berval id = { 0, NULL };
+ struct berval new = { 0, NULL };
struct berval dn;
- struct berval *ndn = NULL;
+ struct berval ndn;
assert( reqoid != NULL );
- assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
+ assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
rc = slap_passwd_parse( reqdata,
&id, NULL, &new, text );
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
"ldbm_back_exop_passwd: \"%s\"\n",
- id ? id->bv_val : "" ));
+ id.bv_val ? id.bv_val : "" ));
#else
Debug( LDAP_DEBUG_ARGS, "==> ldbm_back_exop_passwd: \"%s\"\n",
- id ? id->bv_val : "", 0, 0 );
+ id.bv_val ? id.bv_val : "", 0, 0 );
#endif
goto done;
}
- if( new == NULL || new->bv_len == 0 ) {
- new = slap_passwd_generate();
+ if( new.bv_len == 0 ) {
+ slap_passwd_generate(&new);
- if( new == NULL || new->bv_len == 0 ) {
+ if( new.bv_len == 0 ) {
*text = "password generation failed.";
rc = LDAP_OTHER;
goto done;
}
- *rspdata = slap_passwd_return( new );
+ *rspdata = slap_passwd_return( &new );
}
- hash = slap_passwd_hash( new );
+ slap_passwd_hash( &new, &hash );
- if( hash == NULL || hash->bv_len == 0 ) {
+ if( hash.bv_len == 0 ) {
*text = "password hash failed";
rc = LDAP_OTHER;
goto done;
}
- if( id ) {
- dn = *id;
+ if( id.bv_len ) {
+ dn = id;
} else {
dn = op->o_dn;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"ldbm_back_exop_passwd: \"%s\"%s\n",
- dn.bv_val, id ? " (proxy)" : "" ));
+ dn.bv_val, id.bv_len ? " (proxy)" : "" ));
#else
Debug( LDAP_DEBUG_TRACE, "passwd: \"%s\"%s\n",
- dn.bv_val, id ? " (proxy)" : "", 0 );
+ dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );
#endif
if( dn.bv_len == 0 ) {
goto done;
}
- rc = dnNormalize( NULL, &dn, &ndn );
+ rc = dnNormalize2( NULL, &dn, &ndn );
if( rc != LDAP_SUCCESS ) {
*text = "Invalid DN";
goto done;
}
- e = dn2entry_w( be, ndn->bv_val, NULL );
+ /* grab giant lock for writing */
+ ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
+
+ e = dn2entry_w( be, &ndn, NULL );
if( e == NULL ) {
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
*text = "could not locate authorization entry";
rc = LDAP_NO_SUCH_OBJECT;
goto done;
{
Modifications ml;
- struct berval *vals[2];
+ struct berval vals[2];
char textbuf[SLAP_TEXT_BUFLEN]; /* non-returnable */
vals[0] = hash;
- vals[1] = NULL;
+ vals[1].bv_val = NULL;
ml.sml_desc = slap_schema.si_ad_userPassword;
ml.sml_bvalues = vals;
done:
if( e != NULL ) {
cache_return_entry_w( &li->li_cache, e );
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
}
- if( id != NULL ) {
- ber_bvfree( id );
- }
-
- if( new != NULL ) {
- ber_bvfree( new );
- }
-
- if( hash != NULL ) {
- ber_bvfree( hash );
+ if( hash.bv_val != NULL ) {
+ free( hash.bv_val );
}
- if( ndn != NULL ) {
- ber_bvfree( ndn );
+ if( ndn.bv_val != NULL ) {
+ free( ndn.bv_val );
}
return rc;