summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-02-07 10:41:04 +0100
committerGünther Deschner <gd@samba.org>2008-02-07 10:42:59 +0100
commit44f1485f0b10fdbb1f9adf833e0255affd56360c (patch)
tree47179b64447205dea1218eb5a87e18664daa77ab
parent5881a7f679a34253bc5bd55cc2e61c0d36790fd9 (diff)
downloadsamba-44f1485f0b10fdbb1f9adf833e0255affd56360c.tar.gz
samba-44f1485f0b10fdbb1f9adf833e0255affd56360c.tar.xz
samba-44f1485f0b10fdbb1f9adf833e0255affd56360c.zip
Remove unused marshalling for NET_DSR_GESITENAME.
Guenther (This used to be commit c2682273fdbe35dce0a9caffb829c8693e3cd845)
-rw-r--r--source3/include/rpc_netlogon.h14
-rw-r--r--source3/rpc_client/cli_netlogon.c42
-rw-r--r--source3/rpc_parse/parse_net.c72
3 files changed, 0 insertions, 128 deletions
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index 362ff5f72af..21dd42d77eb 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -1062,18 +1062,4 @@ typedef struct net_r_dsr_getdcname {
WERROR result;
} NET_R_DSR_GETDCNAME;
-/* NET_Q_DSR_GESITENAME */
-typedef struct net_q_dsr_getsitename {
- uint32 ptr_computer_name;
- UNISTR2 uni_computer_name;
-} NET_Q_DSR_GETSITENAME;
-
-/* NET_R_DSR_GETSITENAME */
-typedef struct net_r_dsr_getsitename {
- uint32 ptr_site_name;
- UNISTR2 uni_site_name;
- WERROR result;
-} NET_R_DSR_GETSITENAME;
-
-
#endif /* _RPC_NETLOGON_H */
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 33c0e416bc6..5a0c5816e61 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -515,48 +515,6 @@ WERROR rpccli_netlogon_dsr_getdcname(struct rpc_pipe_client *cli,
return WERR_OK;
}
-/* Dsr_GetSiteName */
-
-WERROR rpccli_netlogon_dsr_getsitename(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- const char *computer_name,
- char **site_name)
-{
- prs_struct qbuf, rbuf;
- NET_Q_DSR_GETSITENAME q;
- NET_R_DSR_GETSITENAME r;
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Initialize input parameters */
-
- init_net_q_dsr_getsitename(&q, computer_name);
-
- /* Marshall data and send request */
-
- CLI_DO_RPC_WERR(cli, mem_ctx, PI_NETLOGON, NET_DSR_GETSITENAME,
- q, r,
- qbuf, rbuf,
- net_io_q_dsr_getsitename,
- net_io_r_dsr_getsitename,
- WERR_GENERAL_FAILURE);
-
- if (!W_ERROR_IS_OK(r.result)) {
- return r.result;
- }
-
- if ((site_name != NULL) &&
- ((*site_name = rpcstr_pull_unistr2_talloc(
- mem_ctx, &r.uni_site_name)) == NULL)) {
- return WERR_GENERAL_FAILURE;
- }
-
- return WERR_OK;
-}
-
-
-
/* Sam synchronisation */
NTSTATUS rpccli_netlogon_sam_sync(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index 8eeefb678fb..c68d9300b9b 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -3476,75 +3476,3 @@ bool net_io_r_dsr_getdcname(const char *desc, NET_R_DSR_GETDCNAME *r_t,
return True;
}
-
-/*******************************************************************
- Inits a NET_Q_DSR_GETSITENAME structure.
-********************************************************************/
-
-void init_net_q_dsr_getsitename(NET_Q_DSR_GETSITENAME *r_t, const char *computer_name)
-{
- DEBUG(5, ("init_net_q_dsr_getsitename\n"));
-
- r_t->ptr_computer_name = (computer_name != NULL);
- init_unistr2(&r_t->uni_computer_name, computer_name, UNI_STR_TERMINATE);
-}
-
-/*******************************************************************
- Reads or writes an NET_Q_DSR_GETSITENAME structure.
-********************************************************************/
-
-bool net_io_q_dsr_getsitename(const char *desc, NET_Q_DSR_GETSITENAME *r_t,
- prs_struct *ps, int depth)
-{
- if (r_t == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "net_io_q_dsr_getsitename");
- depth++;
-
- if (!prs_uint32("ptr_computer_name", ps, depth, &r_t->ptr_computer_name))
- return False;
-
- if (!smb_io_unistr2("computer_name", &r_t->uni_computer_name,
- r_t->ptr_computer_name, ps, depth))
- return False;
-
- if (!prs_align(ps))
- return False;
-
- return True;
-}
-
-/*******************************************************************
- Reads or writes an NET_R_DSR_GETSITENAME structure.
-********************************************************************/
-
-bool net_io_r_dsr_getsitename(const char *desc, NET_R_DSR_GETSITENAME *r_t,
- prs_struct *ps, int depth)
-{
- if (r_t == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "net_io_r_dsr_getsitename");
- depth++;
-
- if (!prs_uint32("ptr_site_name", ps, depth, &r_t->ptr_site_name))
- return False;
-
- if (!prs_align(ps))
- return False;
-
- if (!smb_io_unistr2("site_name", &r_t->uni_site_name,
- r_t->ptr_site_name, ps, depth))
- return False;
-
- if (!prs_align(ps))
- return False;
-
- if (!prs_werror("result", ps, depth, &r_t->result))
- return False;
-
- return True;
-}
-
-