Author: vlendec Date: 2005-02-11 07:47:28 +0000 (Fri, 11 Feb 2005) New Revision: 5327
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5327 Log: Merge revision 5318 from 3_0. Volker Modified: trunk/source/utils/net_rpc.c trunk/source/utils/profiles.c Changeset: Modified: trunk/source/utils/net_rpc.c =================================================================== --- trunk/source/utils/net_rpc.c 2005-02-11 07:20:16 UTC (rev 5326) +++ trunk/source/utils/net_rpc.c 2005-02-11 07:47:28 UTC (rev 5327) @@ -1005,26 +1005,32 @@ result = cli_samr_query_usergroups(cli, mem_ctx, &user_pol, &num_rids, &user_gids); + if (!NT_STATUS_IS_OK(result)) goto done; + /* Look up rids */ - rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids); + if (rids) { + rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids); - for (i = 0; i < num_rids; i++) - rids[i] = user_gids[i].g_rid; + for (i = 0; i < num_rids; i++) + rids[i] = user_gids[i].g_rid; - result = cli_samr_lookup_rids(cli, mem_ctx, &domain_pol, - flags, num_rids, rids, - &num_names, &names, &name_types); + result = cli_samr_lookup_rids(cli, mem_ctx, &domain_pol, + flags, num_rids, rids, + &num_names, &names, &name_types); - if (!NT_STATUS_IS_OK(result)) { - goto done; - } + if (!NT_STATUS_IS_OK(result)) { + goto done; + } - /* Display results */ + /* Display results */ - for (i = 0; i < num_names; i++) - printf("%s\n", names[i]); - + for (i = 0; i < num_names; i++) + printf("%s\n", names[i]); + } + else { + printf("no groups\n"); + } done: return result; } Modified: trunk/source/utils/profiles.c =================================================================== --- trunk/source/utils/profiles.c 2005-02-11 07:20:16 UTC (rev 5326) +++ trunk/source/utils/profiles.c 2005-02-11 07:47:28 UTC (rev 5327) @@ -521,7 +521,7 @@ int main(int argc, char *argv[]) { int opt; - int fd, start = 0; + int fd; char *base; struct stat sbuf; REGF_HDR *regf_hdr; @@ -608,10 +608,9 @@ * Now, mmap the file into memory, check the header and start * dealing with the records. We are interested in the sk record */ - start = 0; #ifdef HAVE_MMAP - base = mmap(&start, sbuf.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + base = mmap(NULL, sbuf.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); #else base = (char *)-1; errno = ENOSYS;