summaryrefslogtreecommitdiffstats
path: root/ldap/servers/slapd/modify.c
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2009-12-01 16:27:23 -0800
committerNathan Kinder <nkinder@redhat.com>2009-12-01 16:27:23 -0800
commitf9ec9a62b8e386c7918b0b9ea628023ed9bd505e (patch)
tree09668c16a0389abdd05567936ad799472c8768bd /ldap/servers/slapd/modify.c
parent16e255be98bbb8b3bcfb080c632add7f048cfd44 (diff)
downloadds-f9ec9a62b8e386c7918b0b9ea628023ed9bd505e.tar.gz
ds-f9ec9a62b8e386c7918b0b9ea628023ed9bd505e.tar.xz
ds-f9ec9a62b8e386c7918b0b9ea628023ed9bd505e.zip
Bug 195302 - Allow fine-grained password storage scheme to be set
This patch makes the server use the password storage scheme set in the appropriate fine-grained password policy (if it is set). The previous code was always using the global storage scheme. This fix was based off of a fix contributed by Ulf Weltman of Hewlett Packard.
Diffstat (limited to 'ldap/servers/slapd/modify.c')
-rw-r--r--ldap/servers/slapd/modify.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/ldap/servers/slapd/modify.c b/ldap/servers/slapd/modify.c
index 1eac8489..40646b2b 100644
--- a/ldap/servers/slapd/modify.c
+++ b/ldap/servers/slapd/modify.c
@@ -32,8 +32,14 @@
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
+ * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
* All rights reserved.
+ *
+ * Contributors:
+ * Hewlett-Packard Development Company, L.P.
+ * Bugfix for bug #195302
+ *
* END COPYRIGHT BLOCK **/
#ifdef HAVE_CONFIG_H
@@ -712,7 +718,7 @@ static void op_shared_modify (Slapi_PBlock *pb, int pw_change, char *old_pw)
valuearray_init_bervalarray(pw_mod->mod_bvalues, &va);
/* encode password */
- pw_encodevals(va);
+ pw_encodevals_ext(pb, &sdn, va);
/* remove current clear value of userpassword */
ber_bvecfree(pw_mod->mod_bvalues);