[Pkg-owncloud-commits] [owncloud] 150/215: Fix error message when wrong user on console

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 47ddd1794bd9e5fa99e25b55513d1cc714583038
Author: Jost Baron <Jost.Baron at gmx.de>
Date:   Tue Apr 28 22:51:19 2015 +0200

    Fix error message when wrong user on console
    
    Owncloud complains if the user runs a shell script with a user other than the user that owns `config/config.php`. The error message does not reflect this, and instead speaks about the web server user. Related issue: #15920 .
---
 console.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/console.php b/console.php
index 3da87b7..2e55acc 100644
--- a/console.php
+++ b/console.php
@@ -47,9 +47,9 @@ try {
 		$user = posix_getpwuid(posix_getuid());
 		$configUser = posix_getpwuid(fileowner(OC::$SERVERROOT . '/config/config.php'));
 		if ($user['name'] !== $configUser['name']) {
-			echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL;
+			echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
 			echo "Current user: " . $user['name'] . PHP_EOL;
-			echo "Web server user: " . $configUser['name'] . PHP_EOL;
+			echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
 			exit(0);
 		}
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git