[SSSD] [PATCH] Fix the 0.11 sysdb upgrade

Jakub Hrozek jhrozek at redhat.com
Tue Jun 5 13:46:47 UTC 2012


The block that upgraded the version was at a wrong indentation level, so
it never ran if there were no fake users to convert.
-------------- next part --------------
>From da8c1b67bb8f881ad463184aa389bb2690c6cadd Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Tue, 5 Jun 2012 15:36:28 +0200
Subject: [PATCH] Fix the 0.11 sysdb upgrade

The block that upgraded the version was at a wrong indentation level, so
it never ran if there were no fake users to convert
---
 src/db/sysdb_upgrade.c |   52 ++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/db/sysdb_upgrade.c b/src/db/sysdb_upgrade.c
index b2dd7dafd3ded99a1f8ae2fcca532dc8dc0742a0..43eff7a0fc577cdd90c25e43b59556fb47c97e71 100644
--- a/src/db/sysdb_upgrade.c
+++ b/src/db/sysdb_upgrade.c
@@ -1277,36 +1277,36 @@ int sysdb_upgrade_10(struct sysdb_ctx *sysdb, const char **ver)
             ret = sysdb_error_to_errno(ret);
             goto done;
         }
+    }
 
-        /* conversion done, upgrade version number */
-        msg = ldb_msg_new(tmp_ctx);
-        if (!msg) {
-            ret = ENOMEM;
-            goto done;
-        }
-        msg->dn = ldb_dn_new(tmp_ctx, sysdb->ldb, SYSDB_BASE);
-        if (!msg->dn) {
-            ret = ENOMEM;
-            goto done;
-        }
+    /* conversion done, upgrade version number */
+    msg = ldb_msg_new(tmp_ctx);
+    if (!msg) {
+        ret = ENOMEM;
+        goto done;
+    }
+    msg->dn = ldb_dn_new(tmp_ctx, sysdb->ldb, SYSDB_BASE);
+    if (!msg->dn) {
+        ret = ENOMEM;
+        goto done;
+    }
 
-        ret = ldb_msg_add_empty(msg, "version", LDB_FLAG_MOD_REPLACE, NULL);
-        if (ret != LDB_SUCCESS) {
-            ret = ENOMEM;
-            goto done;
-        }
+    ret = ldb_msg_add_empty(msg, "version", LDB_FLAG_MOD_REPLACE, NULL);
+    if (ret != LDB_SUCCESS) {
+        ret = ENOMEM;
+        goto done;
+    }
 
-        ret = ldb_msg_add_string(msg, "version", SYSDB_VERSION_0_11);
-        if (ret != LDB_SUCCESS) {
-            ret = ENOMEM;
-            goto done;
-        }
+    ret = ldb_msg_add_string(msg, "version", SYSDB_VERSION_0_11);
+    if (ret != LDB_SUCCESS) {
+        ret = ENOMEM;
+        goto done;
+    }
 
-        ret = ldb_modify(sysdb->ldb, msg);
-        if (ret != LDB_SUCCESS) {
-            ret = sysdb_error_to_errno(ret);
-            goto done;
-        }
+    ret = ldb_modify(sysdb->ldb, msg);
+    if (ret != LDB_SUCCESS) {
+        ret = sysdb_error_to_errno(ret);
+        goto done;
     }
 
     ret = EOK;
-- 
1.7.10.2



More information about the sssd-devel mailing list