From 21d485184df986e1a123f70c689517386e51a5ce Mon Sep 17 00:00:00 2001
From: Michal Zidek <mzidek@redhat.com>
Date: Thu, 16 Aug 2012 18:48:53 +0200
Subject: Unify usage of sysdb transactions

Removing bad examples of usage of sysdb_transaction_start/commit/end
functions and making it more consistent (all files except of
src/db/sysdb_*.c).
---
 src/tools/sss_useradd.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/tools/sss_useradd.c')

diff --git a/src/tools/sss_useradd.c b/src/tools/sss_useradd.c
index 4df7c098e..1bf174c51 100644
--- a/src/tools/sss_useradd.c
+++ b/src/tools/sss_useradd.c
@@ -62,6 +62,8 @@ int main(int argc, const char **argv)
     char *groups = NULL;
     char *badgroup = NULL;
     int ret;
+    errno_t sret;
+    bool in_transaction = false;
 
     debug_prg_name = argv[0];
 
@@ -179,21 +181,23 @@ int main(int argc, const char **argv)
 
     tctx->error = sysdb_transaction_start(tctx->sysdb);
     if (tctx->error != EOK) {
+        DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n"));
         goto done;
     }
+    in_transaction = true;
 
     /* useradd */
     tctx->error = useradd(tctx, tctx->sysdb, tctx->octx);
     if (tctx->error) {
-        /* cancel transaction */
-        sysdb_transaction_cancel(tctx->sysdb);
         goto done;
     }
 
     tctx->error = sysdb_transaction_commit(tctx->sysdb);
     if (tctx->error) {
+        DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction\n"));
         goto done;
     }
+    in_transaction = false;
 
     /* Set SELinux login context - must be done after transaction is done
      * b/c libselinux calls getpwnam */
@@ -249,6 +253,13 @@ int main(int argc, const char **argv)
     }
 
 done:
+    if (in_transaction) {
+        sret = sysdb_transaction_cancel(tctx->sysdb);
+        if (sret != EOK) {
+            DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n"));
+        }
+    }
+
     if (tctx->error) {
         switch (tctx->error) {
             case ERANGE:
-- 
cgit