MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 00:35:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove getpwnam() call from logger, use runas_{uid,gid} from conffile.h

Browse Source
This commit is contained in:
Julien BLACHE 2011-07-09 11:51:48 +02:00
parent a40f3f0629
commit 4b950aa151
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/logger.c
View File

@ -27,7 +27,6 @@
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <pwd.h>
#include <pthread.h> #include <pthread.h>
#include <event.h> #include <event.h>
@ -246,8 +245,6 @@ logger_detach(void)
int int
logger_init(char *file, char *domains, int severity) logger_init(char *file, char *domains, int severity)
{ {
struct passwd *pw;
char *runas;
int ret; int ret;
if ((sizeof(labels) / sizeof(labels[0])) != N_LOGDOMAINS) if ((sizeof(labels) / sizeof(labels[0])) != N_LOGDOMAINS)
@ -272,15 +269,6 @@ logger_init(char *file, char *domains, int severity)
if (!file) if (!file)
return 0; 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"); logfile = fopen(file, "a");
if (!logfile) if (!logfile)
{ {
@ -289,7 +277,7 @@ logger_init(char *file, char *domains, int severity)
return -1; return -1;
} }
ret = fchown(fileno(logfile), pw->pw_uid, 0); ret = fchown(fileno(logfile), runas_uid, 0);
if (ret < 0) if (ret < 0)
fprintf(stderr, "Failed to set ownership on logfile: %s\n", strerror(errno)); fprintf(stderr, "Failed to set ownership on logfile: %s\n", strerror(errno));