From cfaeaf59952b8471e27eda64733ec527a875d7b8 Mon Sep 17 00:00:00 2001 From: William Brown Date: Wed, 30 Mar 2016 13:04:58 +1000 Subject: [PATCH] Ticket 47982 - HR Log timers, regression fix for subsystem logging Bug Description: In the introduction of HR log times subsystem was omitted from the errors log. Fix Description: Re-add the subsystem parameter to subsystem logging. https://fedorahosted.org/389/ticket/47982 Author: wibrown Review by: ??? --- ldap/servers/slapd/log.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c index 80ff53e..34ca10d 100644 --- a/ldap/servers/slapd/log.c +++ b/ldap/servers/slapd/log.c @@ -2289,7 +2289,12 @@ vslapd_log_error( /* blen = strlen(buffer); */ /* This truncates again .... But we have the nice smprintf above! */ - PR_snprintf (buffer+blen, sizeof(buffer)-blen, "%s", vbuf); + if (subsystem == NULL) { + PR_snprintf (buffer+blen, sizeof(buffer)-blen, "%s", vbuf); + } else { + PR_snprintf (buffer+blen, sizeof(buffer)-blen, "%s - %s", subsystem, vbuf); + } + buffer[sizeof(buffer)-1] = '\0'; if (fp) -- 2.5.5