Optimized deluser.

Michael Hierweck

2014-08-28 278954bb977be88ce0019a41d3849def631bd1a2

Optimized deluser.

 hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java

@@ -163,7 +163,7 @@

    private Processor createDelUserProc(String pacName) {
        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);
        proc.appendProcessor(new ShellProcessor("rm -f '/var/spool/cron/crontabs/" + pacName + "'"));
        proc.appendProcessor(new ShellProcessor("rm -f '/var/mail/" + pacName + "'"));

 hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java

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