sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-29 21:47:30 +03:00
Code

using #defines for function prototypes

Browse Source 
(This used to be commit 4a44cccf4401e0ce01303459011ac64805c53561)
This commit is contained in:
Luke Leighton 1999-10-29 18:57:22 +00:00
parent d0fd259514
commit a8b8b8ac3b
3 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/include/ntdomain.h
View File

@ -146,5 +146,13 @@ struct acct_info
uint32 rid; /* domain-relative RID */
};
/*
* higher order functions for use with msrpc client code
*/
#define GROUP_FN(fn) void (*fn)(char*, DOM_SID*, uint32, char*)
#define GROUP_INFO_FN(fn) void (*fn)(char*, DOM_SID*, uint32, GROUP_INFO_CTR *)
#define GROUP_MEM_FN(fn) void(*fn)(char*, DOM_SID*, uint32, char*, uint32, uint32*, char**, uint32*)
#endif /* _NT_DOMAIN_H */

6
source3/include/proto.h
View File

@ -3252,9 +3252,9 @@ BOOL sam_query_groupmem(struct cli_state *cli, uint16 fnum,
uint32 msrpc_sam_enum_groups(struct client_info *info,
struct acct_info **sam,
uint32 *num_sam_entries,
void (*grp_fn)(char*, DOM_SID*, uint32, char*),
void (*grp_inf_fn)(char*, DOM_SID*, uint32, GROUP_INFO_CTR *),
void(*grp_mem_fn)(char*, DOM_SID*, uint32, char*, uint32, uint32*, char**, uint32*));
GROUP_FN(grp_fn),
GROUP_INFO_FN(grp_inf_fn),
GROUP_MEM_FN(grp_mem_fn));
void cmd_sam_enum_groups(struct client_info *info);
/*The following definitions come from rpcclient/cmd_srvsvc.c */

48
source3/rpcclient/cmd_samr.c
View File

@ -2088,25 +2088,6 @@ static void sam_display_group_info(char *domain, DOM_SID *sid,
display_group_info_ctr(out_hnd, ACTION_FOOTER , ctr);
}
static void query_groupinfo(struct cli_state *cli, uint16 fnum,
POLICY_HND *pol_dom,
char *domain,
DOM_SID *sid,
uint32 group_rid,
void (*grp_inf)(char*, DOM_SID*, uint32, GROUP_INFO_CTR *))
{
GROUP_INFO_CTR ctr;
/* send group info query */
if (get_samr_query_groupinfo(smb_cli, fnum,
pol_dom,
1, /* info level */
group_rid, &ctr))
{
grp_inf(domain, sid, group_rid, &ctr);
}
}
static void sam_display_group(char *domain, DOM_SID *sid,
uint32 group_rid, char *group_name)
{
@ -2126,13 +2107,32 @@ static void sam_display_group_members(char *domain, DOM_SID *sid,
display_group_members(out_hnd, ACTION_FOOTER , num_names, name, type);
}
static void query_groupinfo(struct cli_state *cli, uint16 fnum,
POLICY_HND *pol_dom,
char *domain,
DOM_SID *sid,
uint32 group_rid,
GROUP_INFO_FN(grp_inf))
{
GROUP_INFO_CTR ctr;
/* send group info query */
if (get_samr_query_groupinfo(smb_cli, fnum,
pol_dom,
1, /* info level */
group_rid, &ctr))
{
grp_inf(domain, sid, group_rid, &ctr);
}
}
static void req_groupmem_info(struct cli_state *cli, uint16 fnum,
POLICY_HND *pol_dom,
char *domain,
DOM_SID *sid,
uint32 group_rid,
char *group_name,
void(*act_fn)(char*, DOM_SID*, uint32, char*, uint32, uint32*, char**, uint32*))
GROUP_MEM_FN(grp_mem))
{
uint32 num_names = 0;
char **name = NULL;
@ -2143,7 +2143,7 @@ static void req_groupmem_info(struct cli_state *cli, uint16 fnum,
&num_names, &rid_mem, &name, &type))
{
act_fn(domain, sid,
grp_mem(domain, sid,
group_rid, group_name,
num_names, rid_mem, name, type);
@ -2161,9 +2161,9 @@ SAM groups query.
uint32 msrpc_sam_enum_groups(struct client_info *info,
struct acct_info **sam,
uint32 *num_sam_entries,
void (*grp_fn)(char*, DOM_SID*, uint32, char*),
void (*grp_inf_fn)(char*, DOM_SID*, uint32, GROUP_INFO_CTR *),
void(*grp_mem_fn)(char*, DOM_SID*, uint32, char*, uint32, uint32*, char**, uint32*))
GROUP_FN(grp_fn),
GROUP_INFO_FN(grp_inf_fn),
GROUP_MEM_FN(grp_mem_fn))
{
uint16 fnum;
fstring srv_name;