From: Mark Spencer <markster@digium.com>
Date: Sat, 7 Jan 2006 20:08:51 +0000 (+0000)
Subject: Only set group for "runuser" if "rungroup" is not specified.
X-Git-Tag: 1.4.0-beta1~3042
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=e9afca36f9ada49a0818e6a7796182e058f06976;ds=sidebyside

Only set group for "runuser" if "rungroup" is not specified.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/asterisk.c b/asterisk.c
index c81a1b1..da156ef 100644
--- a/asterisk.c
+++ b/asterisk.c
@@ -2171,9 +2171,11 @@ int main(int argc, char *argv[])
 			ast_log(LOG_WARNING, "No such user '%s'!\n", runuser);
 			exit(1);
 		}
-		if (initgroups(pw->pw_name, pw->pw_gid)) {
-			ast_log(LOG_WARNING, "Unable to init groups for '%s'\n", runuser);
-			exit(1);
+		if (!ast_strlen_zero(rungroup))
+			if (initgroups(pw->pw_name, pw->pw_gid)) {
+				ast_log(LOG_WARNING, "Unable to init groups for '%s'\n", runuser);
+				exit(1);
+			}
 		}
 		if (setuid(pw->pw_uid)) {
 			ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", pw->pw_uid, runuser);