Added dnPretty2/dnNormalize2 using preallocated destination berval

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

diff --git a/servers/slapd/back-ldbm/passwd.c b/servers/slapd/back-ldbm/passwd.c
index bafe00d6af79aae162cc9ca782d7172df88da1be..69b496b13081095847dac668a9e9c3bdc371d601 100644 (file)
--- a/servers/slapd/back-ldbm/passwd.c
+++ b/servers/slapd/back-ldbm/passwd.c
@@ -1,7 +1,7 @@
-/* extended.c - ldbm backend extended routines */
+/* passwd.c - ldbm backend password routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -21,12 +21,12 @@ ldbm_back_exop_passwd(
     Backend            *be,
     Connection         *conn,
     Operation          *op,
-       char            *reqoid,
+       const char              *reqoid,
     struct berval      *reqdata,
-       char            **rspoid,
+       char                    **rspoid,
     struct berval      **rspdata,
-       LDAPControl *** rspctrls,
-       char**  text,
+       LDAPControl             *** rspctrls,
+       const char              **text,
     struct berval      *** refs
 )
 {
@@ -38,13 +38,8 @@ ldbm_back_exop_passwd(
        struct berval *id = NULL;
        struct berval *new = NULL;
 
-       char *dn;
-
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       static AttributeDescription *entry = NULL;
-#else
-       static const char *entry = "entry";
-#endif
+       struct berval dn;
+       struct berval ndn;
 
        assert( reqoid != NULL );
        assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
@@ -52,8 +47,15 @@ ldbm_back_exop_passwd(
        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 : "" ));
+#else
        Debug( LDAP_DEBUG_ARGS, "==> ldbm_back_exop_passwd: \"%s\"\n",
                id ? id->bv_val : "", 0, 0 );
+#endif
+
 
        if( rc != LDAP_SUCCESS ) {
                goto done;
@@ -64,7 +66,7 @@ ldbm_back_exop_passwd(
 
                if( new == NULL || new->bv_len == 0 ) {
                        *text = "password generation failed.";
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                        goto done;
                }
                
@@ -75,32 +77,41 @@ ldbm_back_exop_passwd(
 
        if( hash == NULL || hash->bv_len == 0 ) {
                *text = "password hash failed";
-               rc = LDAP_OPERATIONS_ERROR;
+               rc = LDAP_OTHER;
                goto done;
        }
 
-       dn = id ? id->bv_val : op->o_dn;
+       if( id ) {
+               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)" : "" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "passwd: \"%s\"%s\n",
-               dn, id ? " (proxy)" : "", 0 );
+               dn.bv_val, id ? " (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;
        }
 
-       e = dn2entry_w( be, dn, NULL );
-
-       if( e == NULL ) {
-               *text = "could not locate authorization entry";
-               rc = LDAP_OPERATIONS_ERROR;
+       rc = dnNormalize2( NULL, &dn, &ndn );
+       if( rc != LDAP_SUCCESS ) {
+               *text = "Invalid DN";
                goto done;
        }
 
-       if( ! access_allowed( be, conn, op, e, entry, NULL, ACL_WRITE ) ) {
-               *text = "access to authorization entry denied";
-               rc = LDAP_INSUFFICIENT_ACCESS;
+       e = dn2entry_w( be, ndn.bv_val, NULL );
+       if( e == NULL ) {
+               *text = "could not locate authorization entry";
+               rc = LDAP_NO_SUCH_OBJECT;
                goto done;
        }
 
@@ -122,36 +133,43 @@ ldbm_back_exop_passwd(
        {
                Modifications ml;
                struct berval *vals[2];
+               char textbuf[SLAP_TEXT_BUFLEN]; /* non-returnable */
 
                vals[0] = hash;
                vals[1] = NULL;
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-               /* not yet implemented */
-#else
-               ml.ml_type = ch_strdup("userPassword");
-               ml.ml_bvalues = vals;
-               ml.ml_op = LDAP_MOD_REPLACE;
-               ml.ml_next = NULL;
-#endif
+               ml.sml_desc = slap_schema.si_ad_userPassword;
+               ml.sml_bvalues = vals;
+               ml.sml_op = LDAP_MOD_REPLACE;
+               ml.sml_next = NULL;
 
                rc = ldbm_modify_internal( be,
-                       conn, op, op->o_ndn, &ml, e );
+                       conn, op, op->o_ndn.bv_val, &ml, e, text, textbuf, 
+                       sizeof( textbuf ) );
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-               /* not yet implemented */
-#else
-               ch_free(ml.ml_type);
-#endif
-       }
+               /* FIXME: ldbm_modify_internal may set *text = textbuf,
+                * which is BAD */
+               if ( *text == textbuf ) {
+                       *text = NULL;
+               }
+
+               if( rc ) {
+                       /* cannot return textbuf */
+                       *text = "entry modify failed";
+                       goto done;
+               }
 
-       if( rc == LDAP_SUCCESS ) {
                /* change the entry itself */
                if( id2entry_add( be, e ) != 0 ) {
-                       rc = LDAP_OPERATIONS_ERROR;
+                       *text = "entry update failed";
+                       rc = LDAP_OTHER;
+               }
+
+               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 );
@@ -169,5 +187,9 @@ done:
                ber_bvfree( hash );
        }
 
+       if( ndn.bv_val != NULL ) {
+               free( ndn.bv_val );
+       }
+
        return rc;
 }