aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--src/daemon.c9
2 files changed, 7 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 001c32fb5..5559c0b40 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ ver 0.15 - (200?/??/??)
* playlist_directory and music_directory are optional
* playlist: recalculate the queued song after random is toggled
* playlist: don't unpause on delete
+* daemon: ignore "user" setting if already running as that user
ver 0.14.2 (2009/02/13)
diff --git a/src/daemon.c b/src/daemon.c
index 51503bc7a..3071175f5 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -192,9 +192,12 @@ void
daemonize_init(const char *user, const char *_pidfile)
{
#ifndef WIN32
- user_name = g_strdup(user);
- if (user_name != NULL) {
- struct passwd *pwd = getpwnam(user_name);
+ if (user != NULL && strcmp(user, g_get_user_name()) != 0) {
+ struct passwd *pwd;
+
+ user_name = g_strdup(user);
+
+ pwd = getpwnam(user_name);
if (pwd == NULL)
g_error("no such user \"%s\"", user_name);