From c5e28047622aba53c8d009df77ce4d230d4d6637 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 5 May 2006 08:04:28 +0000 Subject: r15452: Again purely cosmetic reformat of the samr query domain info calls. Guenther (This used to be commit 6ed7d7fa70e3f750f921192c0f75594d608875b7) --- source3/rpc_client/cli_samr.c | 6 +++--- source3/rpc_parse/parse_samr.c | 44 ++++++++++++++++++++-------------------- source3/rpc_server/srv_samr.c | 19 ++++++++--------- source3/rpc_server/srv_samr_nt.c | 14 +++++++------ 4 files changed, 42 insertions(+), 41 deletions(-) (limited to 'source3') diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 07b876cc22..09fb997413 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -1102,15 +1102,15 @@ NTSTATUS rpccli_samr_query_dom_info(struct rpc_pipe_client *cli, /* Marshall data and send request */ - init_samr_q_query_dom_info(&q, domain_pol, switch_value); + init_samr_q_query_domain_info(&q, domain_pol, switch_value); r.ctr = ctr; CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_DOMAIN_INFO, q, r, qbuf, rbuf, - samr_io_q_query_dom_info, - samr_io_r_query_dom_info, + samr_io_q_query_domain_info, + samr_io_r_query_domain_info, NT_STATUS_UNSUCCESSFUL); /* Return output parameters */ diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 3d74cf7853..620aad7c7a 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -461,10 +461,10 @@ BOOL samr_io_q_query_sec_obj(const char *desc, SAMR_Q_QUERY_SEC_OBJ * q_u, reads or writes a structure. ********************************************************************/ -void init_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO * q_u, - POLICY_HND *domain_pol, uint16 switch_value) +void init_samr_q_query_domain_info(SAMR_Q_QUERY_DOMAIN_INFO * q_u, + POLICY_HND *domain_pol, uint16 switch_value) { - DEBUG(5, ("samr_init_samr_q_query_dom_info\n")); + DEBUG(5, ("samr_init_samr_q_query_domain_info\n")); q_u->domain_pol = *domain_pol; q_u->switch_value = switch_value; @@ -474,13 +474,13 @@ void init_samr_q_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO * q_u, reads or writes a structure. ********************************************************************/ -BOOL samr_io_q_query_dom_info(const char *desc, SAMR_Q_QUERY_DOMAIN_INFO * q_u, - prs_struct *ps, int depth) +BOOL samr_io_q_query_domain_info(const char *desc, SAMR_Q_QUERY_DOMAIN_INFO * q_u, + prs_struct *ps, int depth) { if (q_u == NULL) return False; - prs_debug(ps, depth, desc, "samr_io_q_query_dom_info"); + prs_debug(ps, depth, desc, "samr_io_q_query_domain_info"); depth++; if(!prs_align(ps)) @@ -924,11 +924,11 @@ static BOOL sam_io_unk_info13(const char *desc, SAM_UNK_INFO_13 * u_13, inits a SAMR_R_QUERY_DOMAIN_INFO structure. ********************************************************************/ -void init_samr_r_query_dom_info(SAMR_R_QUERY_DOMAIN_INFO * r_u, - uint16 switch_value, SAM_UNK_CTR * ctr, - NTSTATUS status) +void init_samr_r_query_domain_info(SAMR_R_QUERY_DOMAIN_INFO * r_u, + uint16 switch_value, SAM_UNK_CTR * ctr, + NTSTATUS status) { - DEBUG(5, ("init_samr_r_query_dom_info\n")); + DEBUG(5, ("init_samr_r_query_domain_info\n")); r_u->ptr_0 = 0; r_u->switch_value = 0; @@ -945,13 +945,13 @@ void init_samr_r_query_dom_info(SAMR_R_QUERY_DOMAIN_INFO * r_u, reads or writes a structure. ********************************************************************/ -BOOL samr_io_r_query_dom_info(const char *desc, SAMR_R_QUERY_DOMAIN_INFO * r_u, - prs_struct *ps, int depth) +BOOL samr_io_r_query_domain_info(const char *desc, SAMR_R_QUERY_DOMAIN_INFO * r_u, + prs_struct *ps, int depth) { if (r_u == NULL) return False; - prs_debug(ps, depth, desc, "samr_io_r_query_dom_info"); + prs_debug(ps, depth, desc, "samr_io_r_query_domain_info"); depth++; if(!prs_align(ps)) @@ -1012,7 +1012,7 @@ BOOL samr_io_r_query_dom_info(const char *desc, SAMR_R_QUERY_DOMAIN_INFO * r_u, return False; break; default: - DEBUG(0, ("samr_io_r_query_dom_info: unknown switch level 0x%x\n", + DEBUG(0, ("samr_io_r_query_domain_info: unknown switch level 0x%x\n", r_u->switch_value)); r_u->status = NT_STATUS_INVALID_INFO_CLASS; return False; @@ -7769,11 +7769,11 @@ BOOL samr_io_q_query_domain_info2(const char *desc, SAMR_Q_QUERY_DOMAIN_INFO2 *q inits a SAMR_R_QUERY_DOMAIN_INFO structure. ********************************************************************/ -void init_samr_r_samr_query_domain_info2(SAMR_R_QUERY_DOMAIN_INFO2 * r_u, - uint16 switch_value, SAM_UNK_CTR * ctr, - NTSTATUS status) +void init_samr_r_query_domain_info2(SAMR_R_QUERY_DOMAIN_INFO2 * r_u, + uint16 switch_value, SAM_UNK_CTR * ctr, + NTSTATUS status) { - DEBUG(5, ("init_samr_r_samr_query_domain_info2\n")); + DEBUG(5, ("init_samr_r_query_domain_info2\n")); r_u->ptr_0 = 0; r_u->switch_value = 0; @@ -7790,13 +7790,13 @@ void init_samr_r_samr_query_domain_info2(SAMR_R_QUERY_DOMAIN_INFO2 * r_u, reads or writes a structure. ********************************************************************/ -BOOL samr_io_r_samr_query_domain_info2(const char *desc, SAMR_R_QUERY_DOMAIN_INFO2 * r_u, - prs_struct *ps, int depth) +BOOL samr_io_r_query_domain_info2(const char *desc, SAMR_R_QUERY_DOMAIN_INFO2 * r_u, + prs_struct *ps, int depth) { if (r_u == NULL) return False; - prs_debug(ps, depth, desc, "samr_io_r_samr_query_domain_info2"); + prs_debug(ps, depth, desc, "samr_io_r_query_domain_info2"); depth++; if(!prs_align(ps)) @@ -7841,7 +7841,7 @@ BOOL samr_io_r_samr_query_domain_info2(const char *desc, SAMR_R_QUERY_DOMAIN_INF return False; break; default: - DEBUG(0, ("samr_io_r_samr_query_domain_info2: unknown switch level 0x%x\n", + DEBUG(0, ("samr_io_r_query_domain_info2: unknown switch level 0x%x\n", r_u->switch_value)); r_u->status = NT_STATUS_INVALID_INFO_CLASS; return False; diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index 8e4955a81c..6ce4f88261 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -525,10 +525,10 @@ static BOOL api_samr_query_usergroups(pipes_struct *p) } /******************************************************************* - api_samr_query_dom_info + api_samr_query_domain_info ********************************************************************/ -static BOOL api_samr_query_dom_info(pipes_struct *p) +static BOOL api_samr_query_domain_info(pipes_struct *p) { SAMR_Q_QUERY_DOMAIN_INFO q_u; SAMR_R_QUERY_DOMAIN_INFO r_u; @@ -538,16 +538,16 @@ static BOOL api_samr_query_dom_info(pipes_struct *p) ZERO_STRUCT(q_u); ZERO_STRUCT(r_u); - if(!samr_io_q_query_dom_info("", &q_u, data, 0)) { - DEBUG(0,("api_samr_query_dom_info: unable to unmarshall SAMR_Q_QUERY_DOMAIN_INFO.\n")); + if(!samr_io_q_query_domain_info("", &q_u, data, 0)) { + DEBUG(0,("api_samr_query_domain_info: unable to unmarshall SAMR_Q_QUERY_DOMAIN_INFO.\n")); return False; } - r_u.status = _samr_query_dom_info(p, &q_u, &r_u); + r_u.status = _samr_query_domain_info(p, &q_u, &r_u); /* store the response in the SMB stream */ - if(!samr_io_r_query_dom_info("", &r_u, rdata, 0)) { - DEBUG(0,("api_samr_query_dom_info: unable to marshall SAMR_R_QUERY_DOMAIN_INFO.\n")); + if(!samr_io_r_query_domain_info("", &r_u, rdata, 0)) { + DEBUG(0,("api_samr_query_domain_info: unable to marshall SAMR_R_QUERY_DOMAIN_INFO.\n")); return False; } @@ -1449,7 +1449,6 @@ static BOOL api_samr_query_domain_info2(pipes_struct *p) ZERO_STRUCT(q_u); ZERO_STRUCT(r_u); - /* grab the samr unknown 8 command */ if(!samr_io_q_query_domain_info2("", &q_u, data, 0)) { DEBUG(0,("api_samr_query_domain_info2: unable to unmarshall SAMR_Q_QUERY_DOMAIN_INFO2.\n")); return False; @@ -1458,7 +1457,7 @@ static BOOL api_samr_query_domain_info2(pipes_struct *p) r_u.status = _samr_query_domain_info2(p, &q_u, &r_u); /* store the response in the SMB stream */ - if(!samr_io_r_samr_query_domain_info2("", &r_u, rdata, 0)) { + if(!samr_io_r_query_domain_info2("", &r_u, rdata, 0)) { DEBUG(0,("api_samr_query_domain_info2: unable to marshall SAMR_R_QUERY_DOMAIN_INFO2.\n")); return False; } @@ -1529,7 +1528,7 @@ static struct api_struct api_samr_cmds [] = {"SAMR_SET_USERINFO" , SAMR_SET_USERINFO , api_samr_set_userinfo }, {"SAMR_SET_USERINFO2" , SAMR_SET_USERINFO2 , api_samr_set_userinfo2 }, - {"SAMR_QUERY_DOMAIN_INFO" , SAMR_QUERY_DOMAIN_INFO, api_samr_query_dom_info }, + {"SAMR_QUERY_DOMAIN_INFO" , SAMR_QUERY_DOMAIN_INFO, api_samr_query_domain_info}, {"SAMR_QUERY_USERGROUPS" , SAMR_QUERY_USERGROUPS , api_samr_query_usergroups }, {"SAMR_QUERY_DISPINFO" , SAMR_QUERY_DISPINFO , api_samr_query_dispinfo }, {"SAMR_QUERY_DISPINFO3" , SAMR_QUERY_DISPINFO3 , api_samr_query_dispinfo }, diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 035f838048..d2a8447786 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -2180,10 +2180,12 @@ NTSTATUS _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, S } /******************************************************************* - _samr_query_dom_info + _samr_query_domain_info ********************************************************************/ -NTSTATUS _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SAMR_R_QUERY_DOMAIN_INFO *r_u) +NTSTATUS _samr_query_domain_info(pipes_struct *p, + SAMR_Q_QUERY_DOMAIN_INFO *q_u, + SAMR_R_QUERY_DOMAIN_INFO *r_u) { struct samr_info *info = NULL; SAM_UNK_CTR *ctr; @@ -2212,7 +2214,7 @@ NTSTATUS _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SA r_u->status = NT_STATUS_OK; - DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__)); + DEBUG(5,("_samr_query_domain_info: %d\n", __LINE__)); /* find the policy handle. open a policy on it. */ if (!find_policy_by_hnd(p, &q_u->domain_pol, (void **)(void *)&info)) { @@ -2364,9 +2366,9 @@ NTSTATUS _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SA } - init_samr_r_query_dom_info(r_u, q_u->switch_value, ctr, NT_STATUS_OK); + init_samr_r_query_domain_info(r_u, q_u->switch_value, ctr, NT_STATUS_OK); - DEBUG(5,("_samr_query_dom_info: %d\n", __LINE__)); + DEBUG(5,("_samr_query_domain_info: %d\n", __LINE__)); return r_u->status; } @@ -4847,7 +4849,7 @@ NTSTATUS _samr_query_domain_info2(pipes_struct *p, return NT_STATUS_INVALID_INFO_CLASS; } - init_samr_r_samr_query_domain_info2(r_u, q_u->switch_value, ctr, NT_STATUS_OK); + init_samr_r_query_domain_info2(r_u, q_u->switch_value, ctr, NT_STATUS_OK); DEBUG(5,("_samr_query_domain_info2: %d\n", __LINE__)); -- cgit