hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Optimized deluser.

Browse Source
This commit is contained in:
Michael Hierweck 2014-08-28 17:45:21 +02:00
parent 1f2eb8a099
commit 278954bb97
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
View File

@ -163,7 +163,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
private Processor createDelUserProc(String pacName) { private Processor createDelUserProc(String pacName) {
Processor killProcessesProc = new ShellProcessor("killall -TERM -u " + pacName + " && sleep 5 && killall -KILL -u " + pacName + " && sleep 5 || true"); Processor killProcessesProc = new ShellProcessor("killall -TERM -u " + pacName + " && sleep 5 && killall -KILL -u " + pacName + " && sleep 5 || true");
Processor userdelProc = new ShellProcessor("deluser --remove-all-files " + pacName); Processor userdelProc = new ShellProcessor("deluser --remove-home " + pacName);
CompoundProcessor proc = new CompoundProcessor(killProcessesProc, userdelProc); CompoundProcessor proc = new CompoundProcessor(killProcessesProc, userdelProc);
proc.appendProcessor(new ShellProcessor("rm -f '/var/spool/cron/crontabs/" + pacName + "'")); proc.appendProcessor(new ShellProcessor("rm -f '/var/spool/cron/crontabs/" + pacName + "'"));
proc.appendProcessor(new ShellProcessor("rm -f '/var/mail/" + pacName + "'")); proc.appendProcessor(new ShellProcessor("rm -f '/var/mail/" + pacName + "'"));

2
hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java
View File

@ -59,7 +59,7 @@ public class UnixUserProcessorFactory implements EntityProcessorFactory {
Processor killProcessesProc = new ShellProcessor("killall -TERM -u " + uid + " && sleep 5 && killall -KILL -u " + uid + " && sleep 5 || true"); Processor killProcessesProc = new ShellProcessor("killall -TERM -u " + uid + " && sleep 5 && killall -KILL -u " + uid + " && sleep 5 || true");
Processor userdelProc = null; Processor userdelProc = null;
if (user.isDefaultHomedir()) { if (user.isDefaultHomedir()) {
userdelProc = new ShellProcessor("deluser --remove-all-files " + uid); userdelProc = new ShellProcessor("deluser --remove-home " + uid);
} else { } else {
userdelProc = new ShellProcessor("deluser " + uid); userdelProc = new ShellProcessor("deluser " + uid);
} }