The branch, v3-2-test has been updated
via c2682273fdbe35dce0a9caffb829c8693e3cd845 (commit)
via 609c40fdd9b4c94cdf5b25cd6ac39a2a57432e0d (commit)
from a495e0e7c1eb91dd700a7d0fe9832fd0811cb2bb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit c2682273fdbe35dce0a9caffb829c8693e3cd845
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Feb 7 10:41:04 2008 +0100
Remove unused marshalling for NET_DSR_GESITENAME.
Guenther
commit 609c40fdd9b4c94cdf5b25cd6ac39a2a57432e0d
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Feb 7 10:39:08 2008 +0100
Use rpccli_netr_DsRGetSiteName() in rpcclient.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/include/rpc_netlogon.h | 14 -------
source/rpc_client/cli_netlogon.c | 42 ----------------------
source/rpc_parse/parse_net.c | 72 --------------------------------------
source/rpcclient/cmd_netlogon.c | 19 +++++++---
4 files changed, 13 insertions(+), 134 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index 362ff5f..21dd42d 100644
--- a/source/include/rpc_netlogon.h
+++ b/source/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/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 33c0e41..5a0c581 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/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/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index 8eeefb6..c68d930 100644
--- a/source/rpc_parse/parse_net.c
+++ b/source/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;
-}
-
-
diff --git a/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c
index e1d13d3..ecd033f 100644
--- a/source/rpcclient/cmd_netlogon.c
+++ b/source/rpcclient/cmd_netlogon.c
@@ -314,20 +314,27 @@ static WERROR cmd_netlogon_dsr_getsitename(struct
rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx, int argc,
const char **argv)
{
- WERROR result;
- char *sitename;
+ WERROR werr;
+ NTSTATUS status;
+ const char *sitename = NULL;
if (argc != 2) {
fprintf(stderr, "Usage: %s computername\n", argv[0]);
return WERR_OK;
}
- result = rpccli_netlogon_dsr_getsitename(cli, mem_ctx, argv[1],
&sitename);
+ status = rpccli_netr_DsRGetSiteName(cli, mem_ctx,
+ argv[1],
+ &sitename,
+ &werr);
+ if (!NT_STATUS_IS_OK(status)) {
+ return ntstatus_to_werror(status);
+ }
- if (!W_ERROR_IS_OK(result)) {
+ if (!W_ERROR_IS_OK(werr)) {
printf("rpccli_netlogon_dsr_gesitename returned %s\n",
- nt_errstr(werror_to_ntstatus(result)));
- return result;
+ nt_errstr(werror_to_ntstatus(werr)));
+ return werr;
}
printf("Computer %s is on Site: %s\n", argv[1], sitename);
--
Samba Shared Repository
