From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 21 Dec 2007 15:14:52 +0000 (+0000)
Subject: Merged revisions 94418 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~338
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bca1033817d6b1957b98f62f41673608217389c2;p=thirdparty%2Fasterisk.git

Merged revisions 94418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r94418 | tilghman | 2007-12-21 09:07:42 -0600 (Fri, 21 Dec 2007) | 2 lines

Fix for restart-as-user problem reported via the -dev list

........


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

diff --git a/main/asterisk.c b/main/asterisk.c
index 60b25444de..ea464b76ab 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2959,7 +2959,7 @@ int main(int argc, char *argv[])
 				ast_log(LOG_WARNING, "Unable to setgid to %d!\n", (int)pw->pw_gid);
 				exit(1);
 			}
-			if (initgroups(pw->pw_name, pw->pw_gid)) {
+			if (isroot && initgroups(pw->pw_name, pw->pw_gid)) {
 				ast_log(LOG_WARNING, "Unable to init groups for '%s'\n", runuser);
 				exit(1);
 			}