X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fpasswd.c;h=685a187cbd2c60ac522861181e3309a8279defd6;hb=3972e13fc3de47d46a1d81655fac9b1baaae5622;hp=76613bbb7d20ead6ea6f2f21fbe8e2ac00981f1a;hpb=468664c4433666557413100e435e4c2d68810272;p=openldap diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c index 76613bbb7d..685a187cbd 100644 --- a/servers/slapd/back-bdb/passwd.c +++ b/servers/slapd/back-bdb/passwd.c @@ -1,7 +1,7 @@ /* passwd.c - bdb backend password routines */ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -12,108 +12,156 @@ #include "back-bdb.h" #include "external.h" +#include "lber_pvt.h" int bdb_exop_passwd( Backend *be, Connection *conn, Operation *op, - const char *reqoid, + struct berval *reqoid, struct berval *reqdata, char **rspoid, struct berval **rspdata, LDAPControl *** rspctrls, const char **text, - struct berval *** refs ) + BerVarray *refs ) { struct bdb_info *bdb = (struct bdb_info *) be->be_private; int rc; Entry *e = NULL; - struct berval *hash = NULL; + struct berval hash = { 0, NULL }; DB_TXN *ltid = NULL; struct bdb_op_info opinfo; + char textbuf[SLAP_TEXT_BUFLEN]; + size_t textlen = sizeof textbuf; - struct berval *id = NULL; - struct berval *new = NULL; + struct berval id = { 0, NULL }; + struct berval new = { 0, NULL }; - char *dn; + struct berval dn; + struct berval ndn; + + u_int32_t locker = 0; + DB_LOCK lock; assert( reqoid != NULL ); - assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 ); + assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, reqoid ) == 0 ); rc = slap_passwd_parse( reqdata, &id, NULL, &new, text ); +#ifdef NEW_LOGGING + LDAP_LOG ( ACL, ENTRY, + "==>bdb_exop_passwd: \"%s\"\n", id.bv_val ? id.bv_val : "", 0, 0 ); +#else Debug( LDAP_DEBUG_ARGS, "==> bdb_exop_passwd: \"%s\"\n", - id ? id->bv_val : "", 0, 0 ); + id.bv_val ? id.bv_val : "", 0, 0 ); +#endif if( rc != LDAP_SUCCESS ) { 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; } - dn = id ? id->bv_val : op->o_dn; + if( id.bv_len ) { + dn = id; + } else { + dn = op->o_dn; + } +#ifdef NEW_LOGGING + LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: \"%s\"%s\"\n", + dn.bv_val, id.bv_len ? " (proxy)" : "", 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: \"%s\"%s\n", - dn, id ? " (proxy)" : "", 0 ); + dn.bv_val, id.bv_len ? " (proxy)" : "", 0 ); +#endif - if( dn == NULL || dn[0] == '\0' ) { + if( dn.bv_len == 0 ) { *text = "No password is associated with the Root DSE"; - rc = LDAP_OPERATIONS_ERROR; + rc = LDAP_UNWILLING_TO_PERFORM; goto done; } - if (0) { + rc = dnNormalize2( NULL, &dn, &ndn ); + if( rc != LDAP_SUCCESS ) { + *text = "Invalid DN"; + goto done; + } + + if( 0 ) { retry: /* transaction retry */ + if ( e != NULL ) { + bdb_cache_delete_entry(&bdb->bi_cache, e); + bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e); + } +#ifdef NEW_LOGGING + LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: retrying...\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: retrying...\n", 0, 0, 0 ); - rc = txn_abort( ltid ); +#endif + rc = TXN_ABORT( ltid ); ltid = NULL; op->o_private = NULL; + op->o_do_not_cache = opinfo.boi_acl_cache; if( rc != 0 ) { rc = LDAP_OTHER; *text = "internal error"; goto done; } + ldap_pvt_thread_yield(); } /* begin transaction */ - rc = txn_begin( bdb->bi_dbenv, NULL, <id, 0 ); + rc = TXN_BEGIN( bdb->bi_dbenv, NULL, <id, + bdb->bi_db_opflags ); *text = NULL; if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( ACL, ERR, + "bdb_exop_passwd: txn_begin failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 ); +#endif rc = LDAP_OTHER; *text = "internal error"; goto done; } + locker = TXN_ID ( ltid ); + opinfo.boi_bdb = be; opinfo.boi_txn = ltid; + opinfo.boi_locker = locker; opinfo.boi_err = 0; + opinfo.boi_acl_cache = op->o_do_not_cache; op->o_private = &opinfo; /* get entry */ - rc = bdb_dn2entry( be, ltid, dn, &e, NULL, 0 ); + rc = bdb_dn2entry_w( be, ltid, &ndn, &e, NULL, 0 , locker, &lock); switch(rc) { case DB_LOCK_DEADLOCK: @@ -122,6 +170,9 @@ retry: /* transaction retry */ case DB_NOTFOUND: case 0: break; + case LDAP_BUSY: + *text = "ldap server busy"; + goto done; default: rc = LDAP_OTHER; *text = "internal error"; @@ -134,43 +185,58 @@ retry: /* transaction retry */ goto done; } +#ifdef BDB_SUBENTRIES + if( is_entry_subentry( e ) ) { + /* entry is an alias, don't allow operation */ + *text = "authorization entry is subentry"; + rc = LDAP_OTHER; + goto done; + } +#endif +#ifdef BDB_ALIASES if( is_entry_alias( e ) ) { /* entry is an alias, don't allow operation */ *text = "authorization entry is alias"; rc = LDAP_ALIAS_PROBLEM; goto done; } - +#endif if( is_entry_referral( e ) ) { /* entry is an referral, don't allow operation */ *text = "authorization entry is referral"; - rc = LDAP_OPERATIONS_ERROR; + rc = LDAP_OTHER; goto done; } { Modifications ml; - struct berval *vals[2]; + struct berval vals[2]; vals[0] = hash; - vals[1] = NULL; + vals[1].bv_val = NULL; ml.sml_desc = slap_schema.si_ad_userPassword; - ml.sml_bvalues = vals; + ml.sml_values = vals; +#ifdef SLAP_NVALUES + ml.sml_nvalues = vals; +#endif ml.sml_op = LDAP_MOD_REPLACE; ml.sml_next = NULL; rc = bdb_modify_internal( be, conn, op, ltid, - &ml, e, text ); + &ml, e, text, textbuf, textlen ); + if ( (rc == LDAP_INSUFFICIENT_ACCESS) && opinfo.boi_err ) { + rc = opinfo.boi_err; + } switch(rc) { case DB_LOCK_DEADLOCK: case DB_LOCK_NOTGRANTED: - bdb_entry_return( be, e ); - e = NULL; + *text = NULL; goto retry; case 0: + *text = NULL; break; default: rc = LDAP_OTHER; @@ -178,41 +244,44 @@ retry: /* transaction retry */ goto done; } - } + /* change the entry itself */ + rc = bdb_id2entry_update( be, ltid, e ); + if( rc != 0 ) { + switch(rc) { + case DB_LOCK_DEADLOCK: + case DB_LOCK_NOTGRANTED: + goto retry; + } + *text = "entry update failed"; + rc = LDAP_OTHER; + } - /* change the entry itself */ - rc = bdb_id2entry_update( be, ltid, e ); - if( rc != 0 ) { - switch(rc) { - case DB_LOCK_DEADLOCK: - case DB_LOCK_NOTGRANTED: - bdb_entry_return( be, e ); - e = NULL; - goto retry; + if( rc == 0 ) { + if( op->o_noop ) { + rc = TXN_ABORT( ltid ); + } else { + rc = TXN_COMMIT( ltid, 0 ); + } + ltid = NULL; + } + op->o_private = NULL; + + if( rc == LDAP_SUCCESS ) { + replog( be, op, &e->e_name, &e->e_nname, &ml ); } - *text = "entry update failed"; - rc = LDAP_OTHER; } done: if( e != NULL ) { - bdb_entry_return( be, e ); - } - - if( id != NULL ) { - ber_bvfree( id ); + bdb_unlocked_cache_return_entry_w( &bdb->bi_cache, e ); } - - if( new != NULL ) { - ber_bvfree( new ); - } - - if( hash != NULL ) { - ber_bvfree( hash ); + + if( hash.bv_val != NULL ) { + free( hash.bv_val ); } if( ltid != NULL ) { - txn_abort( ltid ); + TXN_ABORT( ltid ); op->o_private = NULL; }