From 4b950aa1513c9c1e774a9cb1bf5608f1344a9860 Mon Sep 17 00:00:00 2001
From: Julien BLACHE <jb@jblache.org>
Date: Sat, 9 Jul 2011 11:51:48 +0200
Subject: [PATCH] Remove getpwnam() call from logger, use runas_{uid,gid} from
 conffile.h

---
 src/logger.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/logger.c b/src/logger.c
index f63d669e..38aff3cb 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -27,7 +27,6 @@
 #include <time.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <pwd.h>
 #include <pthread.h>
 
 #include <event.h>
@@ -246,8 +245,6 @@ logger_detach(void)
 int
 logger_init(char *file, char *domains, int severity)
 {
-  struct passwd *pw;
-  char *runas;
   int ret;
 
   if ((sizeof(labels) / sizeof(labels[0])) != N_LOGDOMAINS)
@@ -272,15 +269,6 @@ logger_init(char *file, char *domains, int severity)
   if (!file)
     return 0;
 
-  runas = cfg_getstr(cfg_getsec(cfg, "general"), "uid");
-  pw = getpwnam(runas);
-  if (!pw)
-    {
-      fprintf(stderr, "Could not lookup user %s: %s\n", runas, strerror(errno));
-
-      return -1;
-    }
-
   logfile = fopen(file, "a");
   if (!logfile)
     {
@@ -289,7 +277,7 @@ logger_init(char *file, char *domains, int severity)
       return -1;
     }
 
-  ret = fchown(fileno(logfile), pw->pw_uid, 0);
+  ret = fchown(fileno(logfile), runas_uid, 0);
   if (ret < 0)
     fprintf(stderr, "Failed to set ownership on logfile: %s\n", strerror(errno));