From 278954bb977be88ce0019a41d3849def631bd1a2 Mon Sep 17 00:00:00 2001 From: Michael Hierweck Date: Thu, 28 Aug 2014 17:45:21 +0200 Subject: [PATCH] Optimized deluser. --- hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java | 2 +- hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java index 64437c8..0e03363 100644 --- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java @@ -163,7 +163,7 @@ public class PacProcessorFactory implements EntityProcessorFactory { 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 + "'")); diff --git a/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java b/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java index 7ef5840..1aee1be 100644 --- a/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java @@ -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 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); }