Fix a warning in a DEBUG

Clean up the init a little bit, less nested if-statements.

Agreed upon with Simo.

Volker

diff --git a/source/sam/idmap_tdb.c b/source/sam/idmap_tdb.c
index 1f53321c9bb0df8c9ba52c256c29c228ba4b078b..f7f9f02003b2e54f18c724cc874e97e24e9ab659 100644 (file)
--- a/source/sam/idmap_tdb.c
+++ b/source/sam/idmap_tdb.c
@@ -414,7 +414,7 @@ static NTSTATUS db_idmap_init( char *params )
                tdb_is_new = True;
        }
 
-       DEBUG(10,("db_idmap_init: Opening tdbfile\n", tdbfile ));
+       DEBUG(10,("db_idmap_init: Opening tdbfile %s\n", tdbfile ));
 
        /* Open idmap repository */
        if (!(idmap_tdb = tdb_open_log(tdbfile, 0,
@@ -427,20 +427,20 @@ static NTSTATUS db_idmap_init( char *params )
 
        SAFE_FREE(tdbfile);
 
+       if (tdb_is_new) {
+               /* the file didn't existed before opening it, let's
+                * store idmap version as nobody else yet opened and
+                * stored it. I do not like this method but didn't
+                * found a way to understand if an opened tdb have
+                * been just created or not --- SSS */
+               tdb_store_int32(idmap_tdb, "IDMAP_VERSION", IDMAP_VERSION);
+       }
+
        /* check against earlier versions */
        version = tdb_fetch_int32(idmap_tdb, "IDMAP_VERSION");
        if (version != IDMAP_VERSION) {
-               if (tdb_is_new) {
-                       /* the file didn't existed before opening it, let's
-                        * store idmap version as nobody else yet opened and
-                        * stored it. I do not like this method but didn't
-                        * found a way to understand if an opened tdb have
-                        * been just created or not --- SSS */
-                       tdb_store_int32(idmap_tdb, "IDMAP_VERSION", IDMAP_VERSION);
-               } else {
-                       DEBUG(0, ("idmap_init: Unable to open idmap database, it's in an old format!\n"));
-                       return NT_STATUS_INTERNAL_DB_ERROR;
-               }
+               DEBUG(0, ("idmap_init: Unable to open idmap database, it's in an old format!\n"));
+               return NT_STATUS_INTERNAL_DB_ERROR;
        }
 
        /* Create high water marks for group and user id */