From 6508d0c5b766fe56e96741a61ab7a1ece4191f2d Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Fri, 17 May 2013 12:09:10 -0400 Subject: [PATCH] - Possible Fix for: FS#2918 - multiserver - remote access db passwd not changed , when changed access from IP to % and vice versa --- server/plugins-available/shelluser_base_plugin.inc.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php index 6b4e18f..2924d49 100755 --- a/server/plugins-available/shelluser_base_plugin.inc.php +++ b/server/plugins-available/shelluser_base_plugin.inc.php @@ -114,7 +114,7 @@ //* Disable shell user temporarily if we use jailkit if($data['new']['chroot'] == 'jailkit') { - $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']); + $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']).' 2>/dev/null'; exec($command); $app->log("Disabling shelluser temporarily: ".$command,LOGLEVEL_DEBUG); } @@ -162,8 +162,8 @@ exec($command); $app->log("Executed command: $command ",LOGLEVEL_DEBUG); */ - $groupinfo = posix_getgrnam($data['new']['pgroup']); - $app->system->usermod($data['old']['username'],0, $groupinfo[gid], $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']); + //$groupinfo = $app->system->posix_getgrnam($data['new']['pgroup']); + $app->system->usermod($data['old']['username'],0, $app->system->getgid($data['new']['pgroup']), $data['new']['dir'], $data['new']['shell'], $data['new']['password'], $data['new']['username']); $app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG); // call the ssh-rsa update function -- Gitblit v1.9.1