Attachment 313861 Details for Bug 458510 – diffs

[patch] diffs

diffs.bug458510 (text/plain), 2.40 KB, created by Rich Megginson on 2008-08-09 02:25:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-08-09 02:25:27 UTC

Size: 2.40 KB

patch

obsolete

>Index: ldapserver/ldap/servers/slapd/passwd_extop.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/passwd_extop.c,v
>retrieving revision 1.16
>diff -u -8 -r1.16 passwd_extop.c
>--- ldapserver/ldap/servers/slapd/passwd_extop.c	18 Oct 2007 00:08:34 -0000	1.16
>+++ ldapserver/ldap/servers/slapd/passwd_extop.c	9 Aug 2008 02:25:06 -0000
>@@ -426,16 +426,17 @@
> /* Password Modify Extended operation plugin function */
> int
> passwd_modify_extop( Slapi_PBlock *pb )
> {
> 	char		*oid = NULL;
> 	char 		*bindDN = NULL;
> 	char		*authmethod = NULL;
> 	char		*dn = NULL;
>+	char		*otdn = NULL;
> 	char		*oldPasswd = NULL;
> 	char		*newPasswd = NULL;
> 	char		*errMesg = NULL;
> 	int             ret=0, rc=0, sasl_ssf=0;
> 	ber_tag_t	tag=0;
> 	ber_len_t	len=(ber_len_t)-1;
> 	struct berval	*extop_value = NULL;
> 	struct berval	*gen_passwd = NULL;
>@@ -656,16 +657,17 @@
> 		ber_free( response_ber, 1 );
> 	 }
> 	 
> 	 
> 	 /* Determine the target DN for this operation */
> 	 /* Did they give us a DN ? */
> 	 if (dn == NULL || *dn == '\0') {
> 	 	/* Get the DN from the bind identity on this connection */
>+        slapi_ch_free_string(&dn);
>         dn = slapi_ch_strdup(bindDN);
> 		LDAPDebug( LDAP_DEBUG_ANY,
>     		    "Missing userIdentity in request, using the bind DN instead.\n",
> 		     0, 0, 0 );
> 	 }
> 	 
> 	 slapi_pblock_set( pb, SLAPI_ORIGINAL_TARGET, dn ); 
> 
>@@ -739,23 +741,27 @@
> 		/* Set the reponse to let the user know the generated password */
> 		slapi_pblock_set(pb, SLAPI_EXT_OP_RET_VALUE, gen_passwd);
> 	}
> 	
> 	LDAPDebug( LDAP_DEBUG_TRACE, "<= passwd_modify_extop: %d\n", rc, 0, 0 );
> 	
> 	/* Free anything that we allocated above */
> 	free_and_return:
>+	slapi_ch_free_string(&bindDN); /* slapi_pblock_get SLAPI_CONN_DN does strdup */
> 	slapi_ch_free_string(&oldPasswd);
> 	slapi_ch_free_string(&newPasswd);
> 	/* Either this is the same pointer that we allocated and set above,
> 	 * or whoever used it should have freed it and allocated a new
> 	 * value that we need to free here */
>-	slapi_pblock_get( pb, SLAPI_ORIGINAL_TARGET, &dn );
>-	slapi_ch_free_string(&dn);
>+	slapi_pblock_get( pb, SLAPI_ORIGINAL_TARGET, &otdn );
>+	if (otdn != dn) {
>+		slapi_ch_free_string(&dn);
>+	}
>+	slapi_ch_free_string(&otdn);
> 	slapi_pblock_set( pb, SLAPI_ORIGINAL_TARGET, NULL );
> 	slapi_ch_free_string(&authmethod);
> 
> 	if ( targetEntry != NULL ){
> 		slapi_entry_free (targetEntry); 
> 	}
> 	
> 	if ( ber != NULL ){

Actions: View | Diff

Attachments on bug 458510: 313861 | 314146 | 315146