Matthias Clasen 89ea2d
From 77e2d73723aaef376d97597a61328619b8a204c3 Mon Sep 17 00:00:00 2001
Matthias Clasen 89ea2d
From: Matthias Clasen <mclasen@redhat.com>
Matthias Clasen 89ea2d
Date: Fri, 10 Jan 2014 12:38:55 -0500
Matthias Clasen 89ea2d
Subject: [PATCH] Call userdel consistently
Matthias Clasen 89ea2d
Matthias Clasen 89ea2d
When deleting the users files, we use -f, otherwise we don't. This
Matthias Clasen 89ea2d
leads to inconsistent behaviour. Always pass -f.
Matthias Clasen 89ea2d
---
Matthias Clasen 89ea2d
 src/daemon.c | 7 ++++---
Matthias Clasen 89ea2d
 1 file changed, 4 insertions(+), 3 deletions(-)
Matthias Clasen 89ea2d
Matthias Clasen 89ea2d
diff --git a/src/daemon.c b/src/daemon.c
Matthias Clasen 89ea2d
index b2720f4..cb36f01 100644
Matthias Clasen 89ea2d
--- a/src/daemon.c
Matthias Clasen 89ea2d
+++ b/src/daemon.c
Matthias Clasen 89ea2d
@@ -1289,9 +1289,10 @@ daemon_delete_user_authorized_cb (Daemon                *daemon,
Matthias Clasen 89ea2d
                 argv[5] = NULL;
Matthias Clasen 89ea2d
         }
Matthias Clasen 89ea2d
         else {
Matthias Clasen 89ea2d
-                argv[1] = "--";
Matthias Clasen 89ea2d
-                argv[2] = pwent->pw_name;
Matthias Clasen 89ea2d
-                argv[3] = NULL;
Matthias Clasen 89ea2d
+                argv[1] = "-f";
Matthias Clasen 89ea2d
+                argv[2] = "--";
Matthias Clasen 89ea2d
+                argv[3] = pwent->pw_name;
Matthias Clasen 89ea2d
+                argv[4] = NULL;
Matthias Clasen 89ea2d
         }
Matthias Clasen 89ea2d
 
Matthias Clasen 89ea2d
         error = NULL;
Matthias Clasen 89ea2d
-- 
Matthias Clasen 89ea2d
1.8.4.2
Matthias Clasen 89ea2d