diff options
| author | Volker Lendecke <vl@samba.org> | 2015-08-21 11:25:33 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-08-31 13:23:48 +0200 |
| commit | 8370cb4c012ab813c7f19c54686c82a81a03da64 (patch) | |
| tree | ca2d2759816a8e00a6cbdf7cfb605aac9624c111 | |
| parent | 4e987b39ab6e5e2d5e87282b1008ac49a392c1ae (diff) | |
| download | samba-8370cb4c012ab813c7f19c54686c82a81a03da64.tar.gz | |
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
(cherry picked from commit 617bc3fe611266b8d3d0fd47b839d4ac8ad73f8f)
Autobuild-User(v4-3-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-3-test): Mon Aug 31 13:23:48 CEST 2015 on sn-devel-104
| -rw-r--r-- | source3/winbindd/winbindd.h | 7 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 33 |
2 files changed, 0 insertions, 40 deletions
diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index b2105e370cc..441b57f366f 100644 --- 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 233b5c97fa8..57ee40c052b 100644 --- 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", |