winbind: Remove "have_idmap_config" from winbindd_domain

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11464

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Aug 24 19:19:31 CEST 2015 on sn-devel-104

diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index b2105e370cc1d92475ba55da3100c80b0f4f6219..441b57f366fb6925f3343eb5780af5494106140d 100644 (file)
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -179,13 +179,6 @@ struct winbindd_domain {
 
        void *private_data;
 
-       /*
-        * idmap config settings, used to tell the idmap child which
-        * special domain config to use for a mapping
-        */
-       bool have_idmap_config;
-       uint32_t id_range_low, id_range_high;
-
        /* A working DC */
        pid_t dc_probe_pid; /* Child we're using to detect the DC. */
        char *dcname;

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 233b5c97fa8977470a3bd6dcd9333736c33b9490..57ee40c052b8914662136cbe4bfac7cb2f6beec2 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -125,8 +125,6 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
 {
        struct winbindd_domain *domain;
        const char *alternative_name = NULL;
-       char *idmap_config_option;
-       const char *param;
        const char **ignored_domains, **dom;
        int role = lp_server_role();
 
@@ -252,37 +250,6 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
 
        wcache_tdc_add_domain( domain );
 
-       idmap_config_option = talloc_asprintf(talloc_tos(), "idmap config %s",
-                                             domain->name);
-       if (idmap_config_option == NULL) {
-               DEBUG(0, ("talloc failed, not looking for idmap config\n"));
-               goto done;
-       }
-
-       param = lp_parm_const_string(-1, idmap_config_option, "range", NULL);
-
-       DEBUG(10, ("%s : range = %s\n", idmap_config_option,
-                  param ? param : "not defined"));
-
-       if (param != NULL) {
-               unsigned low_id, high_id;
-               if (sscanf(param, "%u - %u", &low_id, &high_id) != 2) {
-                       DEBUG(1, ("invalid range syntax in %s: %s\n",
-                                 idmap_config_option, param));
-                       goto done;
-               }
-               if (low_id > high_id) {
-                       DEBUG(1, ("invalid range in %s: %s\n",
-                                 idmap_config_option, param));
-                       goto done;
-               }
-               domain->have_idmap_config = true;
-               domain->id_range_low = low_id;
-               domain->id_range_high = high_id;
-       }
-
-done:
-
        setup_domain_child(domain);
 
        DEBUG(2,("Added domain %s %s %s\n",