|
 |
dc8c34 |
From 0dc56a4ea2192c6724c23a730476aa9b2af5657b Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Ludwig Krispenz <lkrispen@redhat.com>
|
|
|
dc8c34 |
Date: Fri, 14 Oct 2016 13:50:18 +0200
|
|
|
dc8c34 |
Subject: [PATCH 410/410] Ticket 49009 - args debug logging must be more
|
|
|
dc8c34 |
restrictive
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Bug Description: turning on args debugging logs all attribute value, including #unhashed#
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Fix Description: filter unhashed attrs
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/49009
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Reviewed by: ?
|
|
|
dc8c34 |
|
|
|
dc8c34 |
(cherry picked from commit ca0d132acbd26c16501540411b198cd2a3b71252)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/entry.c | 1 +
|
|
|
dc8c34 |
ldap/servers/slapd/entrywsi.c | 1 +
|
|
|
dc8c34 |
2 files changed, 2 insertions(+)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
|
|
|
dc8c34 |
index f3d9c86..09671a4 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/entry.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/entry.c
|
|
|
dc8c34 |
@@ -3332,6 +3332,7 @@ entry_apply_mod( Slapi_Entry *e, const LDAPMod *mod )
|
|
|
dc8c34 |
if((strcasecmp(mod->mod_type,"objectclass") == 0)
|
|
|
dc8c34 |
&& (strncasecmp((const char *)mod->mod_bvalues[i]->bv_val,"ldapsubentry",mod->mod_bvalues[i]->bv_len) == 0))
|
|
|
dc8c34 |
sawsubentry=PR_TRUE;
|
|
|
dc8c34 |
+ if (0==strcasecmp(PSEUDO_ATTR_UNHASHEDUSERPASSWORD,mod->mod_type)) continue;
|
|
|
dc8c34 |
LDAPDebug( LDAP_DEBUG_ARGS, " %s: %s\n", mod->mod_type, mod->mod_bvalues[i]->bv_val, 0 );
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
|
|
|
dc8c34 |
index 76286a1..3edca33 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/entrywsi.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/entrywsi.c
|
|
|
dc8c34 |
@@ -775,6 +775,7 @@ entry_apply_mod_wsi(Slapi_Entry *e, const LDAPMod *mod, const CSN *csn, int urp)
|
|
|
dc8c34 |
for ( i = 0;
|
|
|
dc8c34 |
mod->mod_bvalues != NULL && mod->mod_bvalues[i] != NULL;
|
|
|
dc8c34 |
i++ ) {
|
|
|
dc8c34 |
+ if (0==strcasecmp(PSEUDO_ATTR_UNHASHEDUSERPASSWORD,mod->mod_type)) continue;
|
|
|
dc8c34 |
LDAPDebug( LDAP_DEBUG_ARGS, " %s: %s\n",
|
|
|
dc8c34 |
mod->mod_type, mod->mod_bvalues[i]->bv_val, 0 );
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
2.4.11
|
|
|
dc8c34 |
|