From d3d61de99f84f2e12e15b7fe247a8098a0244e55 Mon Sep 17 00:00:00 2001 From: William Brown Date: Fri, 13 Oct 2017 22:52:26 +1000 Subject: [PATCH] Ticket 49403 - tidy ns logging Bug Description: nunc-stans logging would swap to a printf mode if DEBUG was defined. Fix Description: NS is in a good state, so we can use slapd log instead. https://pagure.io/389-ds-base/issue/49403 Author: wibrown Review by: ??? --- ldap/servers/slapd/main.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c index ddaceff..f8b591e 100644 --- a/ldap/servers/slapd/main.c +++ b/ldap/servers/slapd/main.c @@ -139,13 +139,6 @@ nunc_stans_logging(int severity, const char *format, va_list varg) va_end(varg_copy); } -static void -ns_printf_logger(int priority __attribute__((unused)), const char *fmt, va_list varg) -{ - /* Should we do anything with priority? */ - vprintf(fmt, varg); -} - static void * nunc_stans_malloc(size_t size) { @@ -219,9 +212,6 @@ main_create_ns(ns_thrpool_t **tp_in) tp_config.stacksize = SLAPD_DEFAULT_THREAD_STACKSIZE; /* Highly likely that we need to re-write logging to be controlled by NS here. */ tp_config.log_fct = nunc_stans_logging; -#ifdef DEBUG - tp_config.log_fct = ns_printf_logger; -#endif tp_config.log_start_fct = NULL; tp_config.log_close_fct = NULL; tp_config.malloc_fct = nunc_stans_malloc; -- 1.8.3.1