From 1f2eb8a0991be32087054a89563f31e09b081030 Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael@hierweck.de>
Date: Thu, 28 Aug 2014 16:57:15 +0200
Subject: [PATCH] User Deletion: killall should not return exit code != 0.
---
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 da54e59..64437c8 100644
--- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
+++ b/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 + "'"));
diff --git a/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java b/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java
index c02a765..7ef5840 100644
--- a/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java
+++ b/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);
--
Gitblit v1.9.3