From 6858dfd409a1e7207668f9a789a74bc4e9613d6a Mon Sep 17 00:00:00 2001
From: William Brown <firstyear@redhat.com>
Date: Mar 31 2016 00:15:16 +0000
Subject: 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: mreynolds (Thanks!)

---

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)