Attachment 3371 Details for Bug 5551 – Additional patch

[patch] Additional patch

look (text/plain), 2.46 KB, created by Jeremy Allison on 2008-06-25 17:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-06-25 17:10:08 UTC

Size: 2.46 KB

patch

obsolete

>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,

Actions: View

Attachments on bug 5551: 3355 | 3363 | 3367 | 3369 | 3370 | 3371