[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  8963e80 Revert "s3:idmap_autorid: add a talloc_stackframe() to idmap_autorid_initialize()"
       via  56e94c2 Revert "s3:idmap_autorid: use "idmap config <DOMAIN> : rangesize" instead of "autorid:rangesize""
       via  c4427f0 Revert "s3:idmap_autorid: fail initialization if the domain is not "*""
       via  241ed0a s3:registry/reg_parse_internal.c: add copyright information
       via  d901905 s3:registry/reg_parse_internal.h: add copyright information
      from  530e4ca s3-param Remove 'time offset' from smb.conf

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8963e807e39097278f4f6134a72e016ca7d21279
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:36:38 2011 +0200

    Revert "s3:idmap_autorid: add a talloc_stackframe() to idmap_autorid_initialize()"
    
    This reverts commit 65490ea4e67bf82cf8fb0b8e4e74047c3f63c509.
    
    This sequence of patches needs to be done differently.
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Sat Jun 11 12:55:11 CEST 2011 on sn-devel-104

commit 56e94c203f39eaae35ba82527bf928f876b13ab8
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:36:27 2011 +0200

    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.

commit c4427f06466ad1b5cdc5215704852a559d5a439d
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 10 00:36:17 2011 +0200

    Revert "s3:idmap_autorid: fail initialization if the domain is not "*""
    
    This reverts commit cd8dc47bf17d2cdb1558dc6ab49320ba12af8f34.
    
    This sequence of patches needs to be done differently.

commit 241ed0a04247d5062926443a8a3a481697299e60
Author: Michael Adam <obnox at samba.org>
Date:   Sat Jun 11 00:20:57 2011 +0200

    s3:registry/reg_parse_internal.c: add copyright information

commit d9019052104f3d741b5e123cf43aa5da6804a26b
Author: Michael Adam <obnox at samba.org>
Date:   Sat Jun 11 00:20:32 2011 +0200

    s3:registry/reg_parse_internal.h: add copyright information

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

Summary of changes:
 source3/registry/reg_parse_internal.c |    7 ++++++-
 source3/registry/reg_parse_internal.h |    7 ++++++-
 source3/winbindd/idmap_autorid.c      |   27 +++++----------------------
 3 files changed, 17 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_parse_internal.c b/source3/registry/reg_parse_internal.c
index 721a19c..2088448 100644
--- a/source3/registry/reg_parse_internal.c
+++ b/source3/registry/reg_parse_internal.c
@@ -1,4 +1,9 @@
-/* * Samba Unix/Linux SMB client library
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Registry helper routines
+ *
+ * Copyright (C) Gregor Beck 2010
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/source3/registry/reg_parse_internal.h b/source3/registry/reg_parse_internal.h
index ef59161..14fed89 100644
--- a/source3/registry/reg_parse_internal.h
+++ b/source3/registry/reg_parse_internal.h
@@ -1,4 +1,9 @@
-/* Samba Unix/Linux SMB client library
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Registry helper routines
+ *
+ * Copyright (C) Gregor Beck 2010
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 0e1750d..e9048d8 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -435,22 +435,11 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
 	struct autorid_global_config *storedconfig = NULL;
 	NTSTATUS status;
 	uint32_t hwm;
-	TALLOC_CTX *frame = talloc_stackframe();
-	char *config_option = NULL;
-
-	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));
-		status = NT_STATUS_INVALID_PARAMETER;
-		goto error;
-	}
 
 	config = talloc_zero(dom, struct autorid_global_config);
 	if (!config) {
 		DEBUG(0, ("Out of memory!\n"));
-		status = NT_STATUS_NO_MEMORY;
-		goto error;
+		return NT_STATUS_NO_MEMORY;
 	}
 
 	status = idmap_autorid_db_init();
@@ -458,15 +447,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"));
@@ -498,7 +480,7 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
 		   config->minvalue, config->rangesize, config->maxranges));
 
 	/* read previously stored config and current HWM */
-	storedconfig = idmap_autorid_loadconfig(frame);
+	storedconfig = idmap_autorid_loadconfig(talloc_tos());
 
 	if (!dbwrap_fetch_uint32(autorid_db, HWM, &hwm)) {
 		DEBUG(1, ("Fatal error while fetching current "
@@ -548,7 +530,8 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
 	return NT_STATUS_OK;
 
       error:
-	talloc_free(frame);
+	talloc_free(config);
+	talloc_free(storedconfig);
 
 	return status;
 }


-- 
Samba Shared Repository