summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-12-03 18:40:09 +0100
committerGünther Deschner <gd@samba.org>2007-12-03 18:43:19 +0100
commit6b37d8e627a2b983a5801ec533e536dd67e5f0e5 (patch)
treed630f6697e577ac896471ab8f58b97a19eaf714f
parentf942b8852dcac082c9a378ffde13d65813a39fcd (diff)
downloadsamba-6b37d8e627a2b983a5801ec533e536dd67e5f0e5.tar.gz
samba-6b37d8e627a2b983a5801ec533e536dd67e5f0e5.tar.bz2
samba-6b37d8e627a2b983a5801ec533e536dd67e5f0e5.zip
Fix wkssvc callers.
Guenther (This used to be commit b734cd8aab163d794b969c4e1e721e81a8b4d44c)
-rw-r--r--source3/lib/netapi/joindomain.c9
-rw-r--r--source3/rpcclient/cmd_wkssvc.c6
2 files changed, 7 insertions, 8 deletions
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index f6944e4b1f..210763174e 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -89,14 +89,12 @@ WERROR NetJoinDomain(const char *server_name,
server_name, domain_name,
account_ou, Account,
&encrypted_password,
- join_flags);
+ join_flags, &werr);
if (!NT_STATUS_IS_OK(status)) {
werr = ntstatus_to_werror(status);
goto done;
}
- werr = WERR_OK;
-
done:
if (cli) {
cli_set_timeout(cli, old_timeout);
@@ -166,14 +164,13 @@ WERROR NetUnjoinDomain(const char *server_name,
server_name,
account,
&encrypted_password,
- unjoin_flags);
+ unjoin_flags,
+ &werr);
if (!NT_STATUS_IS_OK(status)) {
werr = ntstatus_to_werror(status);
goto done;
}
- werr = WERR_OK;
-
done:
if (cli) {
cli_set_timeout(cli, old_timeout);
diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c
index 4f4c364ea2..f3ff8113e9 100644
--- a/source3/rpcclient/cmd_wkssvc.c
+++ b/source3/rpcclient/cmd_wkssvc.c
@@ -27,6 +27,7 @@ static WERROR cmd_wkssvc_wkstagetinfo(struct rpc_pipe_client *cli,
const char **argv)
{
NTSTATUS status;
+ WERROR werr;
uint32_t level = 100;
union wkssvc_NetWkstaInfo info;
const char *server_name;
@@ -36,12 +37,13 @@ static WERROR cmd_wkssvc_wkstagetinfo(struct rpc_pipe_client *cli,
status = rpccli_wkssvc_NetWkstaGetInfo(cli, mem_ctx,
server_name,
level,
- &info);
+ &info,
+ &werr);
if (!NT_STATUS_IS_OK(status)) {
return ntstatus_to_werror(status);
}
- return WERR_OK;
+ return werr;
}
struct cmd_set wkssvc_commands[] = {