summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-03-02 15:41:06 +0100
committerMichael Adam <obnox@samba.org>2011-03-22 22:49:56 +0100
commit0a3627d24987efcd99ec5f7808e0d1f15e51c774 (patch)
tree91a04ac6da59d879778ba720752cbda84f7212f4
parent3940777a14a93dbf88fcc9e43452fc2f84a7b6fc (diff)
downloadsamba-0a3627d24987efcd99ec5f7808e0d1f15e51c774.tar.gz
samba-0a3627d24987efcd99ec5f7808e0d1f15e51c774.tar.bz2
samba-0a3627d24987efcd99ec5f7808e0d1f15e51c774.zip
s3:idmap: remove the special treatment of the default domain "*" from idmap_init_domain
-rw-r--r--source3/winbindd/idmap.c88
1 files changed, 23 insertions, 65 deletions
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index a2a727cdb0..94e164ef62 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/winbindd/idmap.c
@@ -208,6 +208,8 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX *mem_ctx,
{
struct idmap_domain *result;
NTSTATUS status;
+ char *config_option = NULL;
+ const char *range;
result = talloc_zero(mem_ctx, struct idmap_domain);
if (result == NULL) {
@@ -224,78 +226,34 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX *mem_ctx,
/*
* load ranges and read only information from the config
*/
- if (strequal(result->name, "*")) {
- /*
- * The default domain "*" is configured differently
- * from named domains.
- */
- uid_t low_uid = 0;
- uid_t high_uid = 0;
- gid_t low_gid = 0;
- gid_t high_gid = 0;
-
- result->low_id = 0;
- result->high_id = 0;
-
- if (!lp_idmap_uid(&low_uid, &high_uid)) {
- DEBUG(1, ("'idmap uid' not set!\n"));
- if (check_range) {
- goto fail;
- }
- }
- result->low_id = low_uid;
- result->high_id = high_uid;
-
- if (!lp_idmap_gid(&low_gid, &high_gid)) {
- DEBUG(1, ("'idmap gid' not set!\n"));
- if (check_range) {
- goto fail;
- }
- }
-
- if ((low_gid != low_uid) || (high_gid != high_uid)) {
- DEBUG(1, ("Warning: 'idmap uid' and 'idmap gid'"
- " ranges do not agree -- building "
- "intersection\n"));
- result->low_id = MAX(result->low_id, low_gid);
- result->high_id = MIN(result->high_id, high_gid);
- }
-
- result->read_only = lp_idmap_read_only();
- } else {
- char *config_option = NULL;
- const char *range;
+ config_option = talloc_asprintf(result, "idmap config %s",
+ result->name);
+ if (config_option == NULL) {
+ DEBUG(0, ("Out of memory!\n"));
+ goto fail;
+ }
- config_option = talloc_asprintf(result, "idmap config %s",
- result->name);
- if (config_option == NULL) {
- DEBUG(0, ("Out of memory!\n"));
+ range = lp_parm_const_string(-1, config_option, "range", NULL);
+ if (range == NULL) {
+ DEBUG(1, ("idmap range not specified for domain %s\n",
+ result->name));
+ if (check_range) {
goto fail;
}
-
- range = lp_parm_const_string(-1, config_option, "range", NULL);
- if (range == NULL) {
- DEBUG(1, ("idmap range not specified for domain %s\n",
- result ->name));
- if (check_range) {
- goto fail;
- }
- } else if (sscanf(range, "%u - %u", &result->low_id,
- &result->high_id) != 2)
- {
- DEBUG(1, ("invalid range '%s' specified for domain "
- "'%s'\n", range, result->name));
- if (check_range) {
- goto fail;
- }
+ } else if (sscanf(range, "%u - %u", &result->low_id,
+ &result->high_id) != 2)
+ {
+ DEBUG(1, ("invalid range '%s' specified for domain "
+ "'%s'\n", range, result->name));
+ if (check_range) {
+ goto fail;
}
+ }
- result->read_only = lp_parm_bool(-1, config_option, "read only",
- false);
+ result->read_only = lp_parm_bool(-1, config_option, "read only", false);
- talloc_free(config_option);
- }
+ talloc_free(config_option);
if (result->low_id > result->high_id) {
DEBUG(1, ("Error: invalid idmap range detected: %lu - %lu\n",