Attachment 314016 Details for Bug 458666 – new diffs

[patch] new diffs

diffs.bug458666 (text/plain), 1.84 KB, created by Rich Megginson on 2008-08-11 23:27:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-08-11 23:27:00 UTC

Size: 1.84 KB

patch

obsolete

>Index: ldapserver/ldap/servers/slapd/pw.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw.c,v
>retrieving revision 1.17
>diff -u -8 -r1.17 pw.c
>--- ldapserver/ldap/servers/slapd/pw.c	18 Oct 2007 00:08:34 -0000	1.17
>+++ ldapserver/ldap/servers/slapd/pw.c	11 Aug 2008 23:26:23 -0000
>@@ -1281,31 +1281,35 @@
> {
> 	Slapi_Attr     *attr = NULL;
> 	Slapi_Mod      *smodp = NULL, *smod = NULL;
> 	Slapi_ValueSet *vs = NULL;
> 	Slapi_Value    *valp = NULL;
> 	struct berval  *bvp = NULL;
> 	int            i, pwresponse_req = 0;
> 
>-	vs = slapi_valueset_new();
>-
> 	slapi_pblock_get ( pb, SLAPI_PWPOLICY, &pwresponse_req );
> 
>         /* Get a list of present values for attrtype in the existing entry, if there is one */
> 	if (e != NULL )
> 	{
> 		if ( (attr = attrlist_find(e->e_attrs, attrtype)) &&
> 			(!valueset_isempty(&attr->a_present_values)) )
> 		{
>-			/* Add present values to valueset */
>+			/* allocate and add present values to valueset */
> 			slapi_attr_get_valueset( attr, &vs );
> 		}
> 	}
> 
>+	/* allocate new one if not allocated above by
>+	   slapi_attr_get_valueset */
>+	if (!vs) {
>+		vs = slapi_valueset_new();
>+	}
>+
> 	/* Get a list of new values for attrtype from the operation */
> 	if ( (smod = slapi_mod_new()) && smods )
> 	{
> 		for (smodp = slapi_mods_get_first_smod(smods, smod);
> 			smodp != NULL; smodp = slapi_mods_get_next_smod(smods, smod) )
> 		{
> 			/* Operation has new values for attrtype */
> 			if ( PL_strcasecmp(attrtype, slapi_mod_get_type(smodp)) == 0 )
>@@ -1857,13 +1861,14 @@
> 			PR_snprintf ( errorbuf, BUFSIZ, 
> 				"%s: invalid encoding scheme - %s\nValid values are: %s\n",
> 				CONFIG_PW_STORAGESCHEME_ATTRIBUTE, value, scheme_list );
> 		}
> 
> 		retVal = LDAP_CONSTRAINT_VIOLATION;
> 	}
>     
>+	free_pw_scheme(new_scheme);
> 	slapi_ch_free_string(&scheme_list);
> 
> 	return retVal;
> }
>

Actions: View | Diff

Attachments on bug 458666: 313965 | 314016 | 314147 | 315147