From cf0ea874b1a7cb1dcaaea159d9a4a8a5deae1310 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Fri, 4 Dec 1998 16:30:00 +0000 Subject: - renamed do_samr_xxx to samr_xxx - renamed do_lsa_xxx to lsa_xxx - added "enumgroups [-m]" command, enumerates groups, shows members. - added cmd_sam_add_groupmem(), need to call these in rpcclient.c - added cmd_sam_add_aliasmem(), need to call these in rpcclient.c - modified "enumaliases [-m]" command - improved "enumgroups" and "enumaliases" to display names not just RIDS/SIDs. - renamed "samr_unknown_12" to "samr_lookup_rids". - added the following client-side functions: get_samr_query_groupmem() get_samr_query_aliasmem() get_samr_query_groupinfo() samr_enum_dom_groups() samr_enum_dom_aliases() samr_add_aliasmem() samr_add_groupmem() - improved display output (display.c) (This used to be commit eacc5e581af2b4de24186b9be3238b352c54effe) --- source3/lib/sids.c | 8 ++++---- source3/lib/util.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/sids.c b/source3/lib/sids.c index de0eb40d9f..b308664bcf 100644 --- a/source3/lib/sids.c +++ b/source3/lib/sids.c @@ -223,22 +223,22 @@ BOOL get_domain_sids(DOM_SID *sid3, DOM_SID *sid5, char *servers) res = res ? cli_nt_session_open(&cli, PIPE_LSARPC) : False; /* lookup domain controller; receive a policy handle */ - res = res ? do_lsa_open_policy(&cli, srv_name, &pol, False) : False; + res = res ? lsa_open_policy(&cli, srv_name, &pol, False) : False; if (sid3 != NULL) { /* send client info query, level 3. receive domain name and sid */ - res = res ? do_lsa_query_info_pol(&cli, &pol, 3, dom3, sid3) : False; + res = res ? lsa_query_info_pol(&cli, &pol, 3, dom3, sid3) : False; } if (sid5 != NULL) { /* send client info query, level 5. receive domain name and sid */ - res = res ? do_lsa_query_info_pol(&cli, &pol, 5, dom5, sid5) : False; + res = res ? lsa_query_info_pol(&cli, &pol, 5, dom5, sid5) : False; } /* close policy handle */ - res = res ? do_lsa_close(&cli, &pol) : False; + res = res ? lsa_close(&cli, &pol) : False; /* close the session */ cli_nt_session_close(&cli); diff --git a/source3/lib/util.c b/source3/lib/util.c index dc11c7789c..904b007749 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -121,15 +121,15 @@ BOOL in_group(gid_t group, gid_t current_gid, int ngroups, gid_t *groups) /**************************************************************************** gets either a hex number (0xNNN) or decimal integer (NNN). ****************************************************************************/ -int get_number(const char *tmp) +uint32 get_number(const char *tmp) { if (strnequal(tmp, "0x", 2)) { - return strtol(tmp, (char**)NULL, 16); + return strtoul(tmp, (char**)NULL, 16); } else { - return strtol(tmp, (char**)NULL, 10); + return strtoul(tmp, (char**)NULL, 10); } } @@ -144,7 +144,7 @@ char *Atoic(char *p, int *n, char *c) return NULL; } - (*n) = get_number(p); + (*n) = (int)get_number(p); if (strnequal(p, "0x", 2)) { -- cgit