[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  a1a1a58 s3:idmap_autorid: remove redundant code
       via  496e472 s3:idmap_autorid: in initialize, don't leak storedconfig to talloc_tos() in the success case
       via  ea0b87a s3:idmap_autorid: use "idmap config * : rangesize" instead of "autorid : rangesize"
       via  06c5f80 s3:idmap_autorid: fail initialization if the domain is not "*"
      from  4b414fb s3:net-man: registry enumerate_recursive

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit a1a1a58101319034ea437544313591cb0fd7e7f3
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:50:42 2011 +0200

    s3:idmap_autorid: remove redundant code
    
    The last 4 patches address bug #8213 (Fixes in idmap_autorid).

commit 496e472894c3fbd543fac88c0c2d304116d64ff8
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:49:37 2011 +0200

    s3:idmap_autorid: in initialize, don't leak storedconfig to talloc_tos() in the success case

commit ea0b87a6e9857c27383ae3fac2c37c61427d31fc
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:46:19 2011 +0200

    s3:idmap_autorid: use "idmap config * : rangesize" instead of "autorid : rangesize"

commit 06c5f80ff079c39a3cea10f8a8fc3cc86e04c571
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 7 15:53:49 2011 +0200

    s3:idmap_autorid: fail initialization if the domain is not "*"
    
    autorid can only be used as a backend for the default idmap configuration.

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/idmap_autorid.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 1f4af33..4028a46 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -436,6 +436,13 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
 	NTSTATUS status;
 	uint32_t hwm;
 
+	if (!strequal(dom->name, "*")) {
+		DEBUG(0, ("idmap_autorid_initialize: Error: autorid configured "
+			  "for domain '%s'. But autorid can only be used for "
+			  "the default idmap configuration.\n", dom->name));
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
 	config = TALLOC_ZERO_P(dom, struct autorid_global_config);
 	if (!config) {
 		DEBUG(0, ("Out of memory!\n"));
@@ -448,7 +455,7 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
 	}
 
 	config->minvalue = dom->low_id;
-	config->rangesize = lp_parm_int(-1, "autorid", "rangesize", 100000);
+	config->rangesize = lp_parm_int(-1, "idmap config *", "rangesize", 100000);
 
 	if (config->rangesize < 2000) {
 		DEBUG(1, ("autorid rangesize must be at least 2000\n"));
@@ -523,14 +530,12 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
 
 	dom->private_data = config;
 
-	if (!NT_STATUS_IS_OK(status)) {
-		goto error;
-	}
+	goto done;
 
-	return NT_STATUS_OK;
-
-      error:
+error:
 	talloc_free(config);
+
+done:
 	talloc_free(storedconfig);
 
 	return status;


-- 
Samba Shared Repository