From 15e982543e1d25832ad5f47b07f1564b54d3fd7a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 27 May 2013 03:55:06 -0400
Subject: [PATCH] Fixed typo in error message.
---
server/plugins-available/shelluser_base_plugin.inc.php | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 48e2cde..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
@@ -204,8 +204,7 @@
// We delete only non jailkit users, jailkit users will be deleted by the jailkit plugin.
if ($data['old']['chroot'] != "jailkit") {
$command = 'userdel -f';
- $command .= ' '.escapeshellcmd($data['old']['username']);
-
+ $command .= ' '.escapeshellcmd($data['old']['username']).' &> /dev/null';
exec($command);
$app->log("Deleted shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
}
--
Gitblit v1.9.1