[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-72-g46d374d

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  46d374d0fad91562b4566e2bcdc8560547041086 (commit)
       via  4d7aafc521307d4d3701935c70673afa569a75d5 (commit)
       via  021193844ce74a36fc4932171533714b402b7282 (commit)
       via  993d8d50103a0dc1dddc31c86b82cbfe6083f3b3 (commit)
       via  7cb46e9e59355bcff032085d7d883441a34d2482 (commit)
       via  f45849448e8a61646b16c8c87e501d1e8c819ccc (commit)
       via  c9ee260cc6774ca814532c7b4e9a52ad97c80435 (commit)
      from  30e2e2df600727d64d7ae5daf47e3f04a11975eb (commit)

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


- Log -----------------------------------------------------------------
commit 46d374d0fad91562b4566e2bcdc8560547041086
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 25 15:09:42 2008 -0700

    Part of fix for #5551. Split out the group enumeration functions to a BUILTIN and a Domain
    specific version. Stops the domain groups appearing twice.
    Jeremy.

commit 4d7aafc521307d4d3701935c70673afa569a75d5
Merge: 021193844ce74a36fc4932171533714b402b7282 30e2e2df600727d64d7ae5daf47e3f04a11975eb
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 25 14:57:46 2008 -0700

    Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test

commit 021193844ce74a36fc4932171533714b402b7282
Merge: 993d8d50103a0dc1dddc31c86b82cbfe6083f3b3 907e394e636896a7c6939f667e122cae574cf7d4
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jun 23 18:57:00 2008 -0700

    Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test

commit 993d8d50103a0dc1dddc31c86b82cbfe6083f3b3
Merge: 7cb46e9e59355bcff032085d7d883441a34d2482 d183dc676db0d91ae6b0759c8fd094c4a888d29d
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Jun 21 18:37:22 2008 -0700

    Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test

commit 7cb46e9e59355bcff032085d7d883441a34d2482
Merge: f45849448e8a61646b16c8c87e501d1e8c819ccc 36729f6f1680310d51f126aa4b7760f11e405a9c
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jun 6 15:02:56 2008 -0700

    Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test

commit f45849448e8a61646b16c8c87e501d1e8c819ccc
Merge: c9ee260cc6774ca814532c7b4e9a52ad97c80435 92d067497c60c5eab43bae11e6c1236e6cf760bb
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 30 23:13:23 2008 -0700

    Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test

commit c9ee260cc6774ca814532c7b4e9a52ad97c80435
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 30 18:02:00 2008 -0700

    minor memory leak fix from Chere Zhou <czhou at isilon.com>.
    Jeremy.

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

Summary of changes:
 source/libsmb/asn1.c              |    1 +
 source/nsswitch/winbindd_passdb.c |   42 +++++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/asn1.c b/source/libsmb/asn1.c
index 6ebe9ab..0ad8f24 100644
--- a/source/libsmb/asn1.c
+++ b/source/libsmb/asn1.c
@@ -396,6 +396,7 @@ BOOL asn1_check_OID(ASN1_DATA *data, const char *OID)
 
 	if (strcmp(id, OID) != 0) {
 		data->has_error = True;
+		free(id);
 		return False;
 	}
 	free(id);
diff --git a/source/nsswitch/winbindd_passdb.c b/source/nsswitch/winbindd_passdb.c
index 8d3ff07..56bce1a 100644
--- a/source/nsswitch/winbindd_passdb.c
+++ b/source/nsswitch/winbindd_passdb.c
@@ -73,19 +73,6 @@ static NTSTATUS enum_groups_internal(struct winbindd_domain *domain,
 	return result;
 }
 
-/* list all domain groups */
-static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
-				TALLOC_CTX *mem_ctx,
-				uint32 *num_entries, 
-				struct acct_info **info)
-{
-	return enum_groups_internal(domain,
-				mem_ctx,
-				num_entries,
-				info,
-				SID_NAME_DOM_GRP);
-}
-
 /* List all local groups (aliases) */
 static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
 				TALLOC_CTX *mem_ctx,
@@ -336,6 +323,18 @@ static NTSTATUS password_policy(struct winbindd_domain *domain,
  BUILTIN specific functions.
 *********************************************************************/
 
+/* list all domain groups */
+static NTSTATUS builtin_enum_dom_groups(struct winbindd_domain *domain,
+				TALLOC_CTX *mem_ctx,
+				uint32 *num_entries, 
+				struct acct_info **info)
+{
+	/* BUILTIN doesn't have domain groups */
+	*num_entries = 0;
+	*info = NULL;
+	return NT_STATUS_OK;
+}
+
 /* Query display info for a domain.  This returns enough information plus a
    bit extra to give an overview of domain users for the User Manager
    application. */
@@ -391,6 +390,19 @@ static NTSTATUS builtin_trusted_domains(struct winbindd_domain *domain,
  SAM specific functions.
 *********************************************************************/
 
+/* list all domain groups */
+static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
+				TALLOC_CTX *mem_ctx,
+				uint32 *num_entries, 
+				struct acct_info **info)
+{
+	return enum_groups_internal(domain,
+				mem_ctx,
+				num_entries,
+				info,
+				SID_NAME_DOM_GRP);
+}
+
 static NTSTATUS sam_query_user_list(struct winbindd_domain *domain,
 			       TALLOC_CTX *mem_ctx,
 			       uint32 *num_entries, 
@@ -656,7 +668,7 @@ static NTSTATUS sam_trusted_domains(struct winbindd_domain *domain,
 struct winbindd_methods builtin_passdb_methods = {
 	false,
 	builtin_query_user_list,
-	enum_dom_groups,
+	builtin_enum_dom_groups,
 	enum_local_groups,
 	name_to_sid,
 	sid_to_name,
@@ -675,7 +687,7 @@ struct winbindd_methods builtin_passdb_methods = {
 struct winbindd_methods sam_passdb_methods = {
 	false,
 	sam_query_user_list,
-	enum_dom_groups,
+	sam_enum_dom_groups,
 	enum_local_groups,
 	name_to_sid,
 	sid_to_name,


-- 
Samba Shared Repository