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