X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fpasswd.c;h=a262a9911aa74009a485b084d9ad4139f9e2d982;hb=4a8d8eb78a610baefde7f5b3e0a371961dafff84;hp=bc48e0133b91017cf5ef9b24526958bb5bb53616;hpb=7348603a532b7c2f2721be860bba4dd510796a9f;p=openldap

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index bc48e0133b..a262a9911a 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -27,6 +27,7 @@
 
 #include <lber_pvt.h>
 #include <lutil.h>
+#include <lutil_sha1.h>
 
 static const char *defhash[] = {
 #ifdef LUTIL_SHA1_BYTES
@@ -43,13 +44,14 @@ int passwd_extop(
 {
 	struct berval id = {0, NULL}, hash, *rsp = NULL;
 	req_pwdexop_s *qpw = &op->oq_pwdexop;
+	req_extended_s qext = op->oq_extended;
 	Modifications *ml;
-	Operation op2;
 	slap_callback cb = { NULL, slap_null_cb, NULL, NULL };
 	slap_callback cb2 = { NULL, slap_replog_cb, NULL, NULL };
 	int i, nhash;
 	char **hashes;
 	int	rc;
+	BackendDB *op_be;
 
 	cb2.sc_next = &cb;
 
@@ -107,6 +109,12 @@ int passwd_extop(
 		goto error_return;
 	}
 
+	/* If we've got a glued backend, check the real backend */
+	op_be = op->o_bd;
+	if ( SLAP_GLUE_INSTANCE( op->o_bd )) {
+		op->o_bd = select_backend( &op->o_req_ndn, 0, 0 );
+	}
+
 	if (backend_check_restrictions( op, rs,
 			(struct berval *)&slap_EXOP_MODIFY_PASSWD ) != LDAP_SUCCESS) {
 		rc = rs->sr_err;
@@ -158,6 +166,8 @@ int passwd_extop(
 		goto error_return;
 	}
 
+	op->o_bd = op_be;
+
 	/* Give the backend a chance to handle this itself */
 	if ( op->o_bd->be_extended ) {
 		rs->sr_err = op->o_bd->be_extended( op, rs );
@@ -207,27 +217,27 @@ int passwd_extop(
 		rs->sr_err = LDAP_OTHER;
 
 	} else {
-		op2 = *op;
-		op2.o_tag = LDAP_REQ_MODIFY;
-		op2.o_callback = &cb2;
-		op2.orm_modlist = qpw->rs_mods;
+		slap_callback *sc = op->o_callback;
+
+		op->o_tag = LDAP_REQ_MODIFY;
+		op->o_callback = &cb2;
+		op->orm_modlist = qpw->rs_mods;
 		cb2.sc_private = qpw;	/* let Modify know this was pwdMod,
 					 * if it cares... */
 
-		rs->sr_err = slap_mods_opattrs( &op2, ml, qpw->rs_modtail, &rs->sr_text,
+		rs->sr_err = slap_mods_opattrs( op, ml, qpw->rs_modtail, &rs->sr_text,
 			NULL, 0, 1 );
 		
 		if ( rs->sr_err == LDAP_SUCCESS ) {
-			rs->sr_err = op2.o_bd->be_modify( &op2, rs );
-			/* FIXME: in case it got rewritten... */
-			op->o_req_dn = op2.o_req_dn;
-			op->o_req_ndn = op2.o_req_ndn;
+			rs->sr_err = op->o_bd->be_modify( op, rs );
 		}
 		if ( rs->sr_err == LDAP_SUCCESS ) {
 			rs->sr_rspdata = rsp;
 		} else if ( rsp ) {
 			ber_bvfree( rsp );
 		}
+		op->o_tag = LDAP_REQ_EXTENDED;
+		op->o_callback = sc;
 	}
 	slap_mods_free( qpw->rs_mods );
 	if ( rsp ) {
@@ -235,6 +245,7 @@ int passwd_extop(
 	}
 
 	rc = rs->sr_err;
+	op->oq_extended = qext;
 
 error_return:;
 	if ( !BER_BVISNULL( &op->o_req_dn ) ) {