diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-09-16 18:57:09 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-01-07 12:47:11 +0100 |
| commit | fb13b002d599049f229d2014e1b94f82952b7150 (patch) | |
| tree | 51c982249385fa68ea726e5221c307f803330d67 /source3/rpcclient | |
| parent | 1696b127c61fea76fce3d992632a822ed78de07c (diff) | |
| download | samba-fb13b002d599049f229d2014e1b94f82952b7150.tar.gz samba-fb13b002d599049f229d2014e1b94f82952b7150.tar.xz samba-fb13b002d599049f229d2014e1b94f82952b7150.zip | |
s3:rpcclient: remove unused rpccli_netlogon_setup_creds() from cmd_netlogon_database_redo()
rpccli_netlogon_setup_creds() is already called in the main do_cmd()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/rpcclient')
| -rw-r--r-- | source3/rpcclient/cmd_netlogon.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c index 2e0b5e5a871..8a865a90dbe 100644 --- a/source3/rpcclient/cmd_netlogon.c +++ b/source3/rpcclient/cmd_netlogon.c @@ -1141,12 +1141,8 @@ static NTSTATUS cmd_netlogon_database_redo(struct rpc_pipe_client *cli, NTSTATUS status = NT_STATUS_UNSUCCESSFUL; NTSTATUS result; const char *server_name = cli->desthost; - uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS | - NETLOGON_NEG_SUPPORTS_AES; struct netr_Authenticator clnt_creds, srv_cred; struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL; - unsigned char trust_passwd_hash[16]; - enum netr_SchannelType sec_channel_type = 0; struct netr_ChangeLogEntry e; uint32_t rid = 500; struct dcerpc_binding_handle *b = cli->binding_handle; @@ -1161,25 +1157,10 @@ static NTSTATUS cmd_netlogon_database_redo(struct rpc_pipe_client *cli, sscanf(argv[1], "%d", &rid); } - if (!secrets_fetch_trust_account_password(lp_workgroup(), - trust_passwd_hash, - NULL, &sec_channel_type)) { + if (cli->netlogon_creds == NULL) { return NT_STATUS_UNSUCCESSFUL; } - status = rpccli_netlogon_setup_creds(cli, - server_name, /* server name */ - lp_workgroup(), /* domain */ - lp_netbios_name(), /* client name */ - lp_netbios_name(), /* machine account name */ - trust_passwd_hash, - sec_channel_type, - &neg_flags); - - if (!NT_STATUS_IS_OK(status)) { - return status; - } - status = netlogon_creds_cli_lock(cli->netlogon_creds, mem_ctx, &creds); if (!NT_STATUS_IS_OK(status)) { |