daemon: ignore "user" setting if already running as that user

If mpd.conf specifies a user, and MPD is invoked by exactly this user, ignore the "user" setting. Don't bother to look up its groups and don't attempt to change uid, it won't work anyway.

daemon: ignore "user" setting if already running as that user
98994c59 · Max Kellermann · 59e62d95 · 98994c59 · 98994c59
Commit 98994c59 authored Feb 15, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

NEWS NEWS +1 -0

daemon.c src/daemon.c +6 -3

No files found.
--- 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)

--- 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);