summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-01-10 12:38:55 -0500
committerRay Strode <rstrode@redhat.com>2014-01-10 12:43:16 -0500
commitc501cca967ba8e27bde0f955d406613338f115f0 (patch)
tree93f5ee39da7416770d168916497fb3cfd3ea17e8
parentba13b59cb91ec67c86b3e3fb390d91db01df8963 (diff)
downloadaccountsservice-c501cca967ba8e27bde0f955d406613338f115f0.tar.gz
daemon: call userdel consistently
commit c5905497733bebf9936a7b028a11ca87caf2d71f changed one of the two calls to userdel in the code to use -f. This change was made to ensure users in the logind "closing" state can be deleted (userdel runs pgrep to make sure a user isn't logged in unless -f is passed). Unfortunately, that commit missed the other userdel invocation, and so now there is inconsistent behavior. This commit changes makes sure both invocations pass -f. https://bugs.freedesktop.org/show_bug.cgi?id=65752
-rw-r--r--src/daemon.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/daemon.c b/src/daemon.c
index b2720f4..cb36f01 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1289,9 +1289,10 @@ daemon_delete_user_authorized_cb (Daemon *daemon,
argv[5] = NULL;
}
else {
- argv[1] = "--";
- argv[2] = pwent->pw_name;
- argv[3] = NULL;
+ argv[1] = "-f";
+ argv[2] = "--";
+ argv[3] = pwent->pw_name;
+ argv[4] = NULL;
}
error = NULL;