diff options
| author | Michael Adam <obnox@samba.org> | 2014-07-20 12:11:16 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-07-25 11:52:10 +0200 |
| commit | f3549172083641d0e275a6312edf4adc6b740b98 (patch) | |
| tree | 286679c0b780db5d8bdc877410ba537011fdde76 /source3 | |
| parent | 3ac00c9dc348733f0bb999a91a8faa6443ac99eb (diff) | |
| download | samba-f3549172083641d0e275a6312edf4adc6b740b98.tar.gz samba-f3549172083641d0e275a6312edf4adc6b740b98.tar.xz samba-f3549172083641d0e275a6312edf4adc6b740b98.zip | |
s3:idmap: move loading of idmap options together before range checking in idmap_init_domain()
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/winbindd/idmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c index c76c35022d..e62f477764 100644 --- a/source3/winbindd/idmap.c +++ b/source3/winbindd/idmap.c @@ -219,7 +219,11 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX *mem_ctx, goto fail; } + result->read_only = lp_parm_bool(-1, config_option, "read only", false); range = lp_parm_const_string(-1, config_option, "range", NULL); + + talloc_free(config_option); + if (range == NULL) { if (check_range) { DEBUG(1, ("idmap range not specified for domain %s\n", @@ -236,10 +240,6 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX *mem_ctx, } } - result->read_only = lp_parm_bool(-1, config_option, "read only", false); - - talloc_free(config_option); - if (result->low_id > result->high_id) { DEBUG(1, ("Error: invalid idmap range detected: %lu - %lu\n", (unsigned long)result->low_id, |