From ae2f35d9bab8c91ee2faa2c9ac5c2bfcfcbe3537 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Mon, 12 Apr 2010 10:24:47 -0400
Subject: Fix merge error for sss_userdel.c

---
 src/tools/sss_userdel.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/sss_userdel.c b/src/tools/sss_userdel.c
index be90fc93..869ec9c8 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);
-- 
cgit