ldap/servers/slapd/main.c | 7 +++++++
ldap/servers/slapd/pw_mgmt.c | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit db792dbc7141b03bd33b710b79ed0942c34d6530
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Fri Sep 21 14:12:15 2012 -0700
Trac Ticket #466 - entry_apply_mod - ADD: Failed to set
unhashed#user#password to extension
https://fedorahosted.org/389/ticket/466
Bug Description: If changes are stuck in the chagnelog and the
server is restarted, the changes are being replicated as soon
as plugin_startall is called. At the point, the entry extension
has to be already initialized.
Fix Description: The entry extension initialization which used
to be called in pw_init. Now it is moved to just before
plugin_startall in main.
(cherry picked from commit 91d98369a214a45cd5c8ed716a55ccaf063c6f1d)
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 84ce01d..f696563 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -1164,6 +1164,13 @@ main( int argc, char **argv)
/* init the thread data index for bind dn's */
slapi_td_dn_init();
+ /*
+ * Initialize password storage in entry extension.
+ * Need to be initialized before plugin_startall in case stucked
+ * changes are replicated as soon as the replication plugin is started.
+ */
+ pw_exp_init ();
+
plugin_print_lists();
plugin_startall(argc, argv, 1 /* Start Backends */, 1 /* Start Globals */);
if (housekeeping_start((time_t)0, NULL) == NULL) {
diff --git a/ldap/servers/slapd/pw_mgmt.c b/ldap/servers/slapd/pw_mgmt.c
index f6f3cf3..22d49b7 100644
--- a/ldap/servers/slapd/pw_mgmt.c
+++ b/ldap/servers/slapd/pw_mgmt.c
@@ -309,7 +309,8 @@ pw_init ( void ) {
OCTETSTRING_SYNTAX_OID, 0,
/* Clients don't need to directly modify
* PSEUDO_ATTR_UNHASHEDUSERPASSWORD */
- SLAPI_ATTR_FLAG_NOUSERMOD );
+ SLAPI_ATTR_FLAG_NOUSERMOD|
+ SLAPI_ATTR_FLAG_NOEXPOSE);
}