User Deletion: killall should not return exit code != 0.

Michael Hierweck

2014-08-28 1f2eb8a0991be32087054a89563f31e09b081030

User Deletion: killall should not return exit code != 0.

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

@@ -162,7 +162,7 @@
    }

    private Processor createDelUserProc(String pacName) {
        Processor killProcessesProc = new ShellProcessor("killall -TERM -u " + pacName + " && sleep 5 && killall -KILL -u " + pacName + " && sleep 5");
        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);
        CompoundProcessor proc = new CompoundProcessor(killProcessesProc, userdelProc);
        proc.appendProcessor(new ShellProcessor("rm -f '/var/spool/cron/crontabs/" + pacName + "'"));

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

@@ -56,7 +56,7 @@
        UnixUser user = (UnixUser) entity;
        String uid = user.getName();
        if (uid != null && uid.length() > 4) {
            Processor killProcessesProc = new ShellProcessor("killall -TERM -u " + uid + " && sleep 5 && killall -KILL -u " + uid + " && sleep 5");
            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);