diff --git a/lib/classes/config/class.ConfigDaemon.php b/lib/classes/config/class.ConfigDaemon.php index 01854126..b559bf38 100644 --- a/lib/classes/config/class.ConfigDaemon.php +++ b/lib/classes/config/class.ConfigDaemon.php @@ -71,7 +71,7 @@ class ConfigDaemon { * @var string */ public $title; - + /** * Whether this is the default daemon of the service-category * @var boolean @@ -321,7 +321,7 @@ class ConfigDaemon { if (array_key_exists('chown', $attributes)) { $return[] = array('type' => 'command', 'content' => 'chown ' . $attributes['chown'] . ' "' . $this->_parseContent($attributes['name']) . '"', 'execute' => "post"); } - + // If we have more than 1 element, we want to group this stuff for easier processing later if (count($return) > 1) { $return = array('type' => 'file', 'subcommands' => $return, 'name' => $this->_parseContent($attributes['name'])); @@ -399,10 +399,11 @@ class ConfigDaemon { case "false": if ($order == true) { $return = -1; }; break; case "true": if ($order == false) { $return = -1; }; break; case "notempty": if ($order == "") { $return = -1; }; break; - case "userexists": if (posix_getpwnam($order) === false) { $return = -1; }; break; - case "groupexists": if (posix_getgrnam($order) === false) { $return = -1; }; break; - case "usernotexists": if (is_array(posix_getpwnam($order))) { $return = -1; }; break; - case "groupnotexists": if (is_array(posix_getgrnam($order))) { $return = -1; }; break; + case "userexists": if (posix_getpwuid($order) === false) { $return = -1; }; break; + case "groupexists": if (posix_getgrgid($order) === false) { $return = -1; }; break; + case "usernotexists": if (is_array(posix_getpwuid($order))) { $return = -1; }; break; + case "groupnotexists": if (is_array(posix_getgrgid($order))) { $return = -1; }; break; + case "usernamenotexists": if (is_array(posix_getpwnam($order))) { $return = -1; }; break; case "equals": $return = (isset($attributes['value']) && $attributes['value'] == $order ? 0 : -1); break; } return $return; diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index 3e0e5c3b..871dddd6 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -3875,7 +3875,7 @@ aliases: files {{settings.phpfpm.enabled_ownvhost}} - {{settings.phpfpm.vhost_httpuser}} + {{settings.phpfpm.vhost_httpuser}} diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index 7a3e19f8..38098a2e 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -4696,7 +4696,7 @@ aliases: files {{settings.phpfpm.enabled_ownvhost}} - {{settings.phpfpm.vhost_httpuser}} + {{settings.phpfpm.vhost_httpuser}} diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml index d9374de3..8744fb68 100644 --- a/lib/configfiles/precise.xml +++ b/lib/configfiles/precise.xml @@ -1695,7 +1695,7 @@ aliases: files {{settings.phpfpm.enabled_ownvhost}} - {{settings.phpfpm.vhost_httpuser}} + {{settings.phpfpm.vhost_httpuser}} diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml index f21517b4..57e04262 100644 --- a/lib/configfiles/trusty.xml +++ b/lib/configfiles/trusty.xml @@ -1703,7 +1703,7 @@ aliases: files {{settings.phpfpm.enabled_ownvhost}} - {{settings.phpfpm.vhost_httpuser}} + {{settings.phpfpm.vhost_httpuser}} diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index bf63a447..d5749aad 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -5504,7 +5504,7 @@ aliases: files {{settings.phpfpm.enabled_ownvhost}} - {{settings.phpfpm.vhost_httpuser}} + {{settings.phpfpm.vhost_httpuser}}