Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Guilherme Filippo
ISPConfig 3
Commits
c6538449
Commit
c6538449
authored
Aug 14, 2014
by
Till Brehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: FS#3564 - shell users accounts are not removed.
parent
4f1e6a27
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
server/plugins-available/shelluser_base_plugin.inc.php
server/plugins-available/shelluser_base_plugin.inc.php
+1
-1
server/plugins-available/shelluser_jailkit_plugin.inc.php
server/plugins-available/shelluser_jailkit_plugin.inc.php
+1
-1
No files found.
server/plugins-available/shelluser_base_plugin.inc.php
View file @
c6538449
...
...
@@ -231,7 +231,7 @@ class shelluser_base_plugin {
if
(
$userid
>
$this
->
min_uid
)
{
// We delete only non jailkit users, jailkit users will be deleted by the jailkit plugin.
if
(
$data
[
'old'
][
'chroot'
]
!=
"jailkit"
)
{
$command
=
'userdel -f'
;
$command
=
'
killall -u '
.
escapeshellcmd
(
$data
[
'old'
][
'username'
])
.
' ;
userdel -f'
;
$command
.
=
' '
.
escapeshellcmd
(
$data
[
'old'
][
'username'
])
.
' &> /dev/null'
;
exec
(
$command
);
$app
->
log
(
"Deleted shelluser: "
.
$data
[
'old'
][
'username'
],
LOGLEVEL_DEBUG
);
...
...
server/plugins-available/shelluser_jailkit_plugin.inc.php
View file @
c6538449
...
...
@@ -226,7 +226,7 @@ class shelluser_jailkit_plugin {
$app
->
system
->
web_folder_protection
(
$web
[
'document_root'
],
false
);
if
(
@
is_dir
(
$data
[
'old'
][
'dir'
]
.
$jailkit_chroot_userhome
))
{
$command
=
'userdel -f'
;
$command
=
'
killall -u '
.
escapeshellcmd
(
$data
[
'old'
][
'username'
])
.
' ;
userdel -f'
;
$command
.
=
' '
.
escapeshellcmd
(
$data
[
'old'
][
'username'
])
.
' &> /dev/null'
;
exec
(
$command
);
$app
->
log
(
"Jailkit Plugin -> delete chroot home:"
.
$data
[
'old'
][
'dir'
]
.
$jailkit_chroot_userhome
,
LOGLEVEL_DEBUG
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment