From 41450fe1c39ff56ff9384a3055b44f3310336abb Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 28 Aug 2013 15:07:44 +0200 Subject: idmap_autorid: remove the ignore_builtin bool from the global_config struct The ignore_builtin flag is used only to change the bahaviour of the daemon code, not in the database. Pair-Programmed-With: Michael Adam Signed-off-by: Atul Kulkarni Signed-off-by: Michael Adam Reviewed-by: Volker Lendecke --- source3/winbindd/idmap_autorid.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/winbindd') diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c index b3cd8f3f05..72bd384662 100644 --- a/source3/winbindd/idmap_autorid.c +++ b/source3/winbindd/idmap_autorid.c @@ -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; -- cgit