[asterisk-commits] tilghman: trunk r94419 - in /trunk: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Dec 21 09:14:52 2007
New Revision: 94419

URL: http://svn.digium.com/view/asterisk?view=rev&rev=94419
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=94419&r1=94418&r2=94419
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Fri Dec 21 09:14:52 2007
@@ -2959,7 +2959,7 @@
 				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);
 			}