Attachment 272 Details for Bug 597 – get full name when enumerating users

[patch] get full name when enumerating users

winbind_gecos.patch (text/plain), 2.83 KB, created by Gerald (Jerry) Carter (dead mail address) on 2003-11-25 20:54:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerald (Jerry) Carter (dead mail address)

Created: 2003-11-25 20:54:19 UTC

Size: 2.83 KB

patch

obsolete

>Index: nsswitch/winbindd_rpc.c
>===================================================================
>RCS file: /data/cvs/samba/source/nsswitch/winbindd_rpc.c,v
>retrieving revision 1.25.2.19
>diff -u -B -b -r1.25.2.19 winbindd_rpc.c
>--- nsswitch/winbindd_rpc.c	12 Nov 2003 01:51:04 -0000	1.25.2.19
>+++ nsswitch/winbindd_rpc.c	26 Nov 2003 04:52:43 -0000
>@@ -42,6 +42,9 @@
> 	BOOL got_dom_pol = False;
> 	uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
> 	unsigned int i, start_idx, retry;
>+	SAM_DISPINFO_CTR ctr;
>+	SAM_DISPINFO_1 info1;
>+	uint32 loop_count = 0;
> 
> 	DEBUG(3,("rpc: query_user_list\n"));
> 
>@@ -68,25 +71,28 @@
> 	got_dom_pol = True;
> 
> 	i = start_idx = 0;
>+	ZERO_STRUCT( ctr );
>+	ZERO_STRUCT( info1 );
>+	ctr.sam.info1 = &info1;
>+
> 	do {
> 		TALLOC_CTX *ctx2;
>-		char **dom_users;
>-		uint32 num_dom_users, *dom_rids, j, size = 0xffff;
>-		uint16 acb_mask = ACB_NORMAL;
>+		uint32 num_dom_users, j;
>+		uint32 max_entries, max_size;
> 
> 		if (!(ctx2 = talloc_init("winbindd enum_users"))) {
> 			result = NT_STATUS_NO_MEMORY;
> 			goto done;
> 		}		
> 
>-		result = cli_samr_enum_dom_users(
>-			hnd->cli, ctx2, &dom_pol, &start_idx, acb_mask,
>-			size, &dom_users, &dom_rids, &num_dom_users);
>+		get_query_dispinfo_params( loop_count, &max_entries, &max_size );
>+
>+		result = cli_samr_query_dispinfo(hnd->cli, mem_ctx, &dom_pol,
>+			&start_idx, 1, &num_dom_users, max_entries, max_size, &ctr);
> 
> 		*num_entries += num_dom_users;
> 
>-		*info = talloc_realloc(
>-			mem_ctx, *info, 
>+		*info = talloc_realloc( mem_ctx, *info, 
> 			(*num_entries) * sizeof(WINBIND_USERINFO));
> 
> 		if (!(*info)) {
>@@ -96,10 +102,16 @@
> 		}
> 
> 		for (j = 0; j < num_dom_users; i++, j++) {
>-			(*info)[i].acct_name = 
>-				talloc_strdup(mem_ctx, dom_users[j]);
>-			(*info)[i].full_name = talloc_strdup(mem_ctx, "");
>-			(*info)[i].user_sid = rid_to_talloced_sid(domain, mem_ctx, dom_rids[j]);
>+			fstring username, fullname;
>+			uint32 rid = ctr.sam.info1->sam[j].rid_user;
>+			
>+			unistr2_to_ascii( username, &(&ctr.sam.info1->str[j])->uni_acct_name, sizeof(username)-1);
>+			unistr2_to_ascii( fullname, &(&ctr.sam.info1->str[j])->uni_full_name, sizeof(fullname)-1);
>+			
>+			(*info)[i].acct_name = talloc_strdup(mem_ctx, username );
>+			(*info)[i].full_name = talloc_strdup(mem_ctx, fullname );
>+			(*info)[i].user_sid = rid_to_talloced_sid(domain, mem_ctx, rid );
>+			
> 			/* For the moment we set the primary group for
> 			   every user to be the Domain Users group.
> 			   There are serious problems with determining
>@@ -107,10 +119,9 @@
> 			   This should really be made into a 'winbind
> 			   force group' smb.conf parameter or
> 			   something like that. */
>-			(*info)[i].group_sid 
>-				= rid_to_talloced_sid(domain, 
>-						      mem_ctx, 
>-						      DOMAIN_GROUP_RID_USERS);
>+			   
>+			(*info)[i].group_sid = rid_to_talloced_sid(domain, 
>+				mem_ctx, DOMAIN_GROUP_RID_USERS);
> 		}
> 
> 		talloc_destroy(ctx2);

Actions: View

Attachments on bug 597: 272