summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-04-12 10:24:47 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-04-12 10:44:03 -0400
commitae2f35d9bab8c91ee2faa2c9ac5c2bfcfcbe3537 (patch)
tree5d6165b892eb16f20bedeb77a721fac6bfc0d253
parent03b7b0cc095198c314472a76a47c66db41cc5e5b (diff)
downloadsssd-ae2f35d9bab8c91ee2faa2c9ac5c2bfcfcbe3537.tar.gz
sssd-ae2f35d9bab8c91ee2faa2c9ac5c2bfcfcbe3537.tar.xz
sssd-ae2f35d9bab8c91ee2faa2c9ac5c2bfcfcbe3537.zip
Fix merge error for sss_userdel.c
-rw-r--r--src/tools/sss_userdel.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/tools/sss_userdel.c b/src/tools/sss_userdel.c
index be90fc932..869ec9c80 100644
--- a/src/tools/sss_userdel.c
+++ b/src/tools/sss_userdel.c
@@ -78,22 +78,11 @@ static int kick_user(struct tools_ctx *tctx)
tctx->octx->lock = 1;
- start_transaction(tctx);
- if (tctx->error != EOK) {
- return tctx->error;
- }
-
- ret = usermod(tctx, tctx->ev, tctx->sysdb, tctx->handle, tctx->octx);
+ ret = usermod(tctx, tctx->sysdb, tctx->octx);
if (ret != EOK) {
- talloc_zfree(tctx->handle);
return ret;
}
- end_transaction(tctx);
- if (tctx->error != EOK) {
- return tctx->error;
- }
-
errno = 0;
pid = fork();
if (pid == 0) {
@@ -254,25 +243,16 @@ int main(int argc, const char **argv)
if (ret != EOK) {
tctx->error = ret;
- /* cancel transaction */
- talloc_zfree(tctx->handle);
goto done;
}
}
- start_transaction(tctx);
- if (tctx->error != EOK) {
- goto done;
- }
-
/* userdel */
ret = userdel(tctx, tctx->sysdb, tctx->octx);
if (ret != EOK) {
goto done;
}
- end_transaction(tctx);
-
/* Set SELinux login context - must be done after transaction is done
* b/c libselinux calls getpwnam */
ret = del_seuser(tctx->octx->name);