summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2004-07-26 10:08:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:16 -0500
commit68f62ab74e3f462faf7a010b40e2d8ba1fb865d2 (patch)
tree66001bcaf2db3fba990159c9e805224afa74a70d
parentec1bbbf85890dee1fa68046f5c7f15967536079e (diff)
downloadsamba-68f62ab74e3f462faf7a010b40e2d8ba1fb865d2.tar.gz
samba-68f62ab74e3f462faf7a010b40e2d8ba1fb865d2.tar.bz2
samba-68f62ab74e3f462faf7a010b40e2d8ba1fb865d2.zip
r1590: Small fixes from Günther Deschner
(This used to be commit 2d68fdf06b3b027227ab77372b001b13fd2b494d)
-rw-r--r--source3/rpcclient/cmd_netlogon.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 9e281fefce..b55306ddc8 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -266,10 +266,10 @@ static NTSTATUS cmd_netlogon_sam_logon(struct cli_state *cli,
username = argv[1];
password = argv[2];
- if (argc == 4)
+ if (argc >= 4)
sscanf(argv[3], "%i", &logon_type);
- if (argc == 5)
+ if (argc >= 5)
sscanf(argv[4], "%i", &neg_flags);
if (argc == 6)
@@ -283,10 +283,6 @@ static NTSTATUS cmd_netlogon_sam_logon(struct cli_state *cli,
clnt_deal_with_creds(cli->sess_key, &(cli->clnt_cred), &ret_creds);
- result = cli_netlogon_sam_logon(cli, mem_ctx, &ret_creds, username, password, logon_type);
-
- clnt_deal_with_creds(cli->sess_key, &(cli->clnt_cred), &ret_creds);
-
if (!NT_STATUS_IS_OK(result))
goto done;
@@ -339,7 +335,7 @@ struct cmd_set netlogon_commands[] = {
{ "samsync", RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_sync, NULL, PI_NETLOGON, "Sam Synchronisation", "" },
{ "samdeltas", RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_deltas, NULL, PI_NETLOGON, "Query Sam Deltas", "" },
{ "samlogon", RPC_RTYPE_NTSTATUS, cmd_netlogon_sam_logon, NULL, PI_NETLOGON, "Sam Logon", "" },
- { "samlogon", RPC_RTYPE_NTSTATUS, cmd_netlogon_change_trust_pw, NULL, PI_NETLOGON, "Change Trust Account Password", "" },
+ { "change_trust_pw", RPC_RTYPE_NTSTATUS, cmd_netlogon_change_trust_pw, NULL, PI_NETLOGON, "Change Trust Account Password", "" },
{ NULL }
};