summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-06-10 00:36:27 +0200
committerMichael Adam <obnox@samba.org>2011-06-11 11:44:31 +0200
commit56e94c203f39eaae35ba82527bf928f876b13ab8 (patch)
treeeb3d7ecfac7d80b517097d5ac1e61cc0ea34920d
parentc4427f06466ad1b5cdc5215704852a559d5a439d (diff)
downloadsamba-56e94c203f39eaae35ba82527bf928f876b13ab8.tar.gz
samba-56e94c203f39eaae35ba82527bf928f876b13ab8.tar.bz2
samba-56e94c203f39eaae35ba82527bf928f876b13ab8.zip
Revert "s3:idmap_autorid: use "idmap config <DOMAIN> : rangesize" instead of "autorid:rangesize""
This reverts commit b0b0b625b588057c8c97371934bf21eb1fd985d8. This sequence of patches needs to be done differently.
-rw-r--r--source3/winbindd/idmap_autorid.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index b28382f2af..4e0fdff33a 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -436,7 +436,6 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
NTSTATUS status;
uint32_t hwm;
TALLOC_CTX *frame = talloc_stackframe();
- char *config_option = NULL;
config = talloc_zero(frame, struct autorid_global_config);
if (!config) {
@@ -450,15 +449,8 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
goto error;
}
- config_option = talloc_asprintf(frame, "idmap config %s", dom->name);
- if (config_option == NULL) {
- DEBUG(0, ("Out of memory!\n"));
- status = NT_STATUS_NO_MEMORY;
- goto error;
- }
-
config->minvalue = dom->low_id;
- config->rangesize = lp_parm_int(-1, config_option, "rangesize", 100000);
+ config->rangesize = lp_parm_int(-1, "autorid", "rangesize", 100000);
if (config->rangesize < 2000) {
DEBUG(1, ("autorid rangesize must be at least 2000\n"));