struct berval *id = NULL;
struct berval *new = NULL;
- char *dn;
+ struct berval dn;
+ struct berval ndn;
assert( reqoid != NULL );
assert( strcmp( LDAP_EXOP_X_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 : "" ));
+#else
Debug( LDAP_DEBUG_ARGS, "==> ldbm_back_exop_passwd: \"%s\"\n",
id ? id->bv_val : "", 0, 0 );
+#endif
+
if( rc != LDAP_SUCCESS ) {
goto done;
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 );
+ rc = dnNormalize2( NULL, &dn, &ndn );
+ if( rc != LDAP_SUCCESS ) {
+ *text = "Invalid DN";
+ goto done;
+ }
+ e = dn2entry_w( be, ndn.bv_val, NULL );
if( e == NULL ) {
*text = "could not locate authorization entry";
rc = LDAP_NO_SUCH_OBJECT;
{
Modifications ml;
struct berval *vals[2];
+ char textbuf[SLAP_TEXT_BUFLEN]; /* non-returnable */
vals[0] = hash;
vals[1] = NULL;
ml.sml_next = NULL;
rc = ldbm_modify_internal( be,
- conn, op, op->o_ndn, &ml, e, text );
+ conn, op, op->o_ndn.bv_val, &ml, e, text, textbuf,
+ sizeof( textbuf ) );
- }
+ /* 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 ) {
*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 );
ber_bvfree( hash );
}
+ if( ndn.bv_val != NULL ) {
+ free( ndn.bv_val );
+ }
+
return rc;
}