1 files changed, 9 insertions, 37 deletions

diff --git a/nslcd/log.c b/nslcd/log.c
index f24abd5..56b5936 100644
--- a/nslcd/log.c
+++ b/nslcd/log.c
@@ -36,8 +36,6 @@
 
 #include "log.h"
 
-static int loglevel = LOG_DEBUG;
-
 #define MAX_REQUESTID_LENGTH 40
 
 #ifdef TLS
@@ -62,12 +60,6 @@ static void tls_init_keys(void)
 
 #endif /* no TLS, use pthreads */
 
-/* set loglevel when no logging is configured */
-void log_setdefaultloglevel(int pri)
-{
-  loglevel = pri;
-}
-
 static char *loglevel2sd(int pri) {
   switch(pri) {
   case LOG_EMERG:   return SD_EMERG;
@@ -176,36 +168,16 @@ void log_log(int pri, const char *format, ...)
     fprintf(stderr, SD_ERR "vasprintf() in logger failed");
   }
   va_end(ap);
-  /* do the logging */
-
-  if (pri <= loglevel)
-  {
-    if ((requestid != NULL) && (requestid[0] != '\0'))
-      fprintf(stderr, "%s[sess:%s] <req:%s> %s\n", loglevel2sd(pri), sessionid, requestid, msg);
-    else if ((sessionid != NULL) && (sessionid[0] != '\0'))
-      fprintf(stderr, "%s[sess:%s] %s\n", loglevel2sd(pri), sessionid, msg);
-    else
-      fprintf(stderr, "%s%s\n", loglevel2sd(pri), msg);
-    fflush(stderr);
   }
 
-  free(msg);
-}
-
-static const char *loglevel2str(int loglevel)
-{
-  switch (loglevel)
-  {
-    case LOG_CRIT:    return "crit";
-    case LOG_ERR:     return "error";
-    case LOG_WARNING: return "warning";
-    case LOG_NOTICE:  return "notice";
-    case LOG_INFO:    return "info";
-    case LOG_DEBUG:   return "debug";
-    default:          return "???";
-  }
-}
+  /* do the logging */
+  if ((requestid != NULL) && (requestid[0] != '\0'))
+    fprintf(stderr, "%s[sess:%s] <req:%s> %s\n", loglevel2sd(pri), sessionid, requestid, msg);
+  else if ((sessionid != NULL) && (sessionid[0] != '\0'))
+    fprintf(stderr, "%s[sess:%s] %s\n", loglevel2sd(pri), sessionid, msg);
+  else
+    fprintf(stderr, "%s%s\n", loglevel2sd(pri), msg);
+  fflush(stderr);
 
-void log_log_config(void) {
-  log_log(LOG_DEBUG, "CFG: log %s", loglevel2str(loglevel));
+  free(msg);
 }