From: Jerome Loyet <fat@php.net>
Date: Wed, 23 May 2012 09:31:33 +0000 (+0200)
Subject: - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
X-Git-Tag: php-5.4.4RC2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a07d76c0ba57e6471ac5869af0aaa26206baa284;p=php

- Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start)
---

diff --git a/NEWS b/NEWS
index ff80183153..c8aa208905 100644
--- a/NEWS
+++ b/NEWS
@@ -57,6 +57,8 @@ PHP                                                                        NEWS
 - FPM
   . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
   . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
+  . Fixed bug #61295 (php-fpm should not fail with commented 'user'
+    for non-root start). (fat)
 
 - Libxml:
   . Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 304076d35e..0b2c5aef5a 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -723,8 +723,8 @@ static int fpm_conf_process_all_pools() /* {{{ */
 			}
 		}
 
-		/* user */
-		if (!wp->config->user) {
+		/* alert if user is not set only if we are not root*/
+		if (!wp->config->user && !geteuid()) {
 			zlog(ZLOG_ALERT, "[pool %s] user has not been defined", wp->config->name);
 			return -1;
 		}