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 60b25444dee92db2c896514b5ee2632b4611c2ee..ea464b76ab21eace36cdfacdc02b6abe4e277d3e 100644 (file)
--- 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);
                        }