In DN_SUBTREE use idl_allids instead of explicit malloc.

[openldap] / servers / slapd / back-ldbm / passwd.c

diff --git a/servers/slapd/back-ldbm/passwd.c b/servers/slapd/back-ldbm/passwd.c
index 4e3df088e347afc922b541c2acf301fb9915cee6..58d545283290db421167b2a0bd91cd1e7cac3eb9 100644 (file)
--- a/servers/slapd/back-ldbm/passwd.c
+++ b/servers/slapd/back-ldbm/passwd.c
@@ -1,7 +1,7 @@
 /* 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
  */
 
@@ -27,18 +27,19 @@ ldbm_back_exop_passwd(
     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 };
 
-       char *dn;
+       struct berval dn;
+       struct berval ndn;
 
        assert( reqoid != NULL );
        assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
@@ -49,10 +50,10 @@ ldbm_back_exop_passwd(
 #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
 
 
@@ -60,52 +61,54 @@ ldbm_back_exop_passwd(
                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(( "backend", LDAP_LEVEL_DETAIL1,
-                  "ldbm_back_exop_passwd: \"%s\"%s\n",
-                  dn, id ? " (proxy)" : "" ));
+               "ldbm_back_exop_passwd: \"%s\"%s\n",
+               dn.bv_val, id.bv_len ? " (proxy)" : "" ));
 #else
        Debug( LDAP_DEBUG_TRACE, "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;
                goto done;
        }
 
-       if( dn_normalize( dn ) == NULL ) {
+       rc = dnNormalize2( NULL, &dn, &ndn );
+       if( rc != LDAP_SUCCESS ) {
                *text = "Invalid DN";
-               rc = LDAP_INVALID_DN_SYNTAX;
                goto done;
        }
 
-       e = dn2entry_w( be, dn, NULL );
-
+       e = dn2entry_w( be, &ndn, NULL );
        if( e == NULL ) {
                *text = "could not locate authorization entry";
                rc = LDAP_NO_SUCH_OBJECT;
@@ -129,11 +132,11 @@ ldbm_back_exop_passwd(
 
        {
                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;
@@ -141,10 +144,10 @@ ldbm_back_exop_passwd(
                ml.sml_next = NULL;
 
                rc = ldbm_modify_internal( be,
-                       conn, op, op->o_ndn, &ml, e, text, textbuf, 
+                       conn, op, op->o_ndn.bv_val, &ml, e, text, textbuf, 
                        sizeof( textbuf ) );
 
-               /* FIXME: ldbm_modify_internal may set *tex = textbuf,
+               /* FIXME: ldbm_modify_internal may set *text = textbuf,
                 * which is BAD */
                if ( *text == textbuf ) {
                        *text = NULL;
@@ -162,24 +165,22 @@ ldbm_back_exop_passwd(
                        rc = LDAP_OTHER;
                }
 
-               replog( be, op, e->e_dn, &ml );
+               if( rc == LDAP_SUCCESS ) {
+                       replog( be, op, &e->e_name, &e->e_nname, &ml );
+               }
        }
-       
+
 done:
        if( e != NULL ) {
                cache_return_entry_w( &li->li_cache, e );
        }
 
-       if( id != NULL ) {
-               ber_bvfree( id );
-       }
-
-       if( new != NULL ) {
-               ber_bvfree( new );
+       if( hash.bv_val != NULL ) {
+               free( hash.bv_val );
        }
 
-       if( hash != NULL ) {
-               ber_bvfree( hash );
+       if( ndn.bv_val != NULL ) {
+               free( ndn.bv_val );
        }
 
        return rc;