Attachment 159641 Details for Bug 248924 – Using connection's c_dn for checking for rootdn

[patch] Using connection's c_dn for checking for rootdn

password_reset_case.patch (text/plain), 2.32 KB, created by Masato Taruishi on 2007-07-20 10:43:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Masato Taruishi

Created: 2007-07-20 10:43:36 UTC

Size: 2.32 KB

patch

obsolete

>diff -ur fedora-ds-base-1.1.0-20070320/ldap/servers/slapd/passwd_extop.c fedora-ds-base-1.1.0-20070320.new/ldap/servers/slapd/passwd_extop.c
>--- fedora-ds-base-1.1.0-20070320/ldap/servers/slapd/passwd_extop.c	2007-02-27 11:57:30.000000000 +0900
>+++ fedora-ds-base-1.1.0-20070320.new/ldap/servers/slapd/passwd_extop.c	2007-07-20 19:40:05.000000000 +0900
>@@ -146,7 +146,7 @@
> /* Construct Mods pblock and perform the modify operation 
>  * Sets result of operation in SLAPI_PLUGIN_INTOP_RESULT 
>  */
>-static int passwd_apply_mods(const char *dn, Slapi_Mods *mods) 
>+static int passwd_apply_mods(Slapi_PBlock *pb_orig, const char *dn, Slapi_Mods *mods) 
> {
> 	Slapi_PBlock pb;
> 	int ret=0;
>@@ -163,6 +163,7 @@
> 		  pw_get_componentID(), /* PluginID */
> 		  0); /* Flags */ 
> 
>+	 pb.pb_conn = pb_orig->pb_conn;
> 	 ret =slapi_modify_internal_pb (&pb);
>   
> 	 slapi_pblock_get(&pb, SLAPI_PLUGIN_INTOP_RESULT, &ret);
>@@ -183,7 +184,7 @@
> 
> 
> /* Modify the userPassword attribute field of the entry */
>-static int passwd_modify_userpassword(Slapi_Entry *targetEntry, const char *newPasswd)
>+static int passwd_modify_userpassword(Slapi_PBlock *pb, Slapi_Entry *targetEntry, const char *newPasswd)
> {
> 	char *dn = NULL;
> 	int ret = 0;
>@@ -196,7 +197,7 @@
> 	slapi_mods_add_string(&smods, LDAP_MOD_REPLACE, SLAPI_USERPWD_ATTR, newPasswd);
> 
> 
>-	ret = passwd_apply_mods(dn, &smods);
>+	ret = passwd_apply_mods(pb, dn, &smods);
>  
> 	slapi_mods_done(&smods);
> 	
>@@ -727,7 +728,7 @@
> 	
> 
> 	/* Now we're ready to make actual password change */
>-	ret = passwd_modify_userpassword(targetEntry, newPasswd);
>+	ret = passwd_modify_userpassword(pb, targetEntry, newPasswd);
> 	if (ret != LDAP_SUCCESS) {
> 		/* Failed to modify the password, e.g. because insufficient access allowed */
> 		errMesg = "Failed to update password\n";
>diff -ur fedora-ds-base-1.1.0-20070320/ldap/servers/slapd/pw.c fedora-ds-base-1.1.0-20070320.new/ldap/servers/slapd/pw.c
>--- fedora-ds-base-1.1.0-20070320/ldap/servers/slapd/pw.c	2006-12-06 06:22:09.000000000 +0900
>+++ fedora-ds-base-1.1.0-20070320.new/ldap/servers/slapd/pw.c	2007-07-20 19:40:33.000000000 +0900
>@@ -590,7 +590,7 @@
> 
> 	/* if the password is reset by root, mark it the first time logon */
> 	
>-	if ( pb->pb_requestor_isroot == 1 && 
>+	if ( pb->pb_conn && slapi_dn_isroot( pb->pb_conn->c_dn ) && 
> 	     pwpolicy->pw_must_change){
> 		pw_exp_date = NO_TIME;
>

Actions: View | Diff

Attachments on bug 248924: 159596 | 159641 | 329152