idmap_autorid: remove the ignore_builtin bool from the global_config struct
authorMichael Adam <obnox@samba.org>
Wed, 28 Aug 2013 13:07:44 +0000 (15:07 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 1 Oct 2013 08:49:10 +0000 (10:49 +0200)
The ignore_builtin flag is used only to change the bahaviour of the
daemon code, not in the database.

Pair-Programmed-With: Michael Adam <obnox@samba.org>

Signed-off-by: Atul Kulkarni <atul.kulkarni@in.ibm.com>
Signed-off-by: Michael Adam <obnox@samba.org>
source3/winbindd/idmap_autorid.c

index b3cd8f3f0570fd886ccb696b4abbdfa59532a29a..72bd3846622eb00903fba4f7acf4d0da6977a735 100644 (file)
@@ -97,7 +97,6 @@ struct autorid_global_config {
        uint32_t minvalue;
        uint32_t rangesize;
        uint32_t maxranges;
-       bool ignore_builtin;
 };
 
 struct autorid_range_config {
@@ -112,6 +111,8 @@ struct autorid_range_config {
 /* handle to the tdb storing domain <-> range assignments */
 static struct db_context *autorid_db;
 
+static bool ignore_builtin = false;
+
 static NTSTATUS idmap_autorid_get_domainrange_action(struct db_context *db,
                                              void *private_data)
 {
@@ -622,7 +623,7 @@ static NTSTATUS idmap_autorid_sids_to_unixids(struct idmap_domain *dom,
 
                /* BUILTIN is passdb's job */
                if (dom_sid_equal(&domainsid, &global_sid_Builtin) &&
-                   global->ignore_builtin) {
+                   ignore_builtin) {
                        DEBUG(10, ("Ignoring request for BUILTIN domain\n"));
                        continue;
                }
@@ -982,8 +983,8 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
        DEBUG(5, ("%d domain ranges with a size of %d are available\n",
                  config->maxranges, config->rangesize));
 
-       config->ignore_builtin = lp_parm_bool(-1, "idmap config *",
-                                             "ignore builtin", false);
+       ignore_builtin = lp_parm_bool(-1, "idmap config *",
+                                     "ignore builtin", false);
 
        /* fill the TDB common configuration */
        commonconfig->private_data = config;