*/
#include "includes.h"
+#include "rpc_client/rpc_client.h"
#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon_c.h"
+#include "rpc_client/cli_netlogon.h"
+#include "rpc_client/init_netlogon.h"
+#include "rpc_client/util_netlogon.h"
+#include "../libcli/security/security.h"
/****************************************************************************
Wrapper function that uses the auth and auth2 calls to set up a NETLOGON
enum netr_SchannelType sec_chan_type,
uint32_t *neg_flags_inout)
{
+ NTSTATUS status;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
struct netr_Credential clnt_chal_send;
struct netr_Credential srv_chal_recv;
struct samr_Password password;
bool retried = false;
fstring mach_acct;
+ uint32_t neg_flags = *neg_flags_inout;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
if (!ndr_syntax_id_equal(&cli->abstract_syntax,
&ndr_table_netlogon.syntax_id)) {
generate_random_buffer(clnt_chal_send.data, 8);
/* Get the server challenge. */
- result = rpccli_netr_ServerReqChallenge(cli, talloc_tos(),
+ status = dcerpc_netr_ServerReqChallenge(b, talloc_tos(),
cli->srv_name_slash,
clnt_name,
&clnt_chal_send,
- &srv_chal_recv);
+ &srv_chal_recv,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
if (!NT_STATUS_IS_OK(result)) {
return result;
}
/* Calculate the session key and client credentials */
-
+
cli->dc = netlogon_creds_client_init(cli,
mach_acct,
clnt_name,
&srv_chal_recv,
&password,
&clnt_chal_send,
- *neg_flags_inout);
+ neg_flags);
if (!cli->dc) {
return NT_STATUS_NO_MEMORY;
* Send client auth-2 challenge and receive server repy.
*/
- result = rpccli_netr_ServerAuthenticate2(cli, talloc_tos(),
+ status = dcerpc_netr_ServerAuthenticate2(b, talloc_tos(),
cli->srv_name_slash,
cli->dc->account_name,
sec_chan_type,
cli->dc->computer_name,
&clnt_chal_send, /* input. */
&srv_chal_recv, /* output. */
- neg_flags_inout);
-
+ &neg_flags,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
/* we might be talking to NT4, so let's downgrade in that case and retry
* with the returned neg_flags - gd */
"chain established.\n",
cli->desthost ));
+ cli->dc->negotiate_flags = neg_flags;
+ *neg_flags_inout = neg_flags;
+
return NT_STATUS_OK;
}
const char *username,
const char *password,
const char *workstation,
+ uint16_t validation_level,
int logon_type)
{
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS status;
struct netr_Authenticator clnt_creds;
struct netr_Authenticator ret_creds;
union netr_LogonLevel *logon;
union netr_Validation validation;
uint8_t authoritative;
- int validation_level = 3;
fstring clnt_name_slash;
- uint8 zeros[16];
+ struct dcerpc_binding_handle *b = cli->binding_handle;
ZERO_STRUCT(ret_creds);
- ZERO_STRUCT(zeros);
- logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+ logon = talloc_zero(mem_ctx, union netr_LogonLevel);
if (!logon) {
return NT_STATUS_NO_MEMORY;
}
if (workstation) {
fstr_sprintf( clnt_name_slash, "\\\\%s", workstation );
} else {
- fstr_sprintf( clnt_name_slash, "\\\\%s", global_myname() );
+ fstr_sprintf( clnt_name_slash, "\\\\%s", lp_netbios_name() );
}
/* Initialise input parameters */
struct samr_Password lmpassword;
struct samr_Password ntpassword;
- password_info = TALLOC_ZERO_P(mem_ctx, struct netr_PasswordInfo);
+ password_info = talloc_zero(mem_ctx, struct netr_PasswordInfo);
if (!password_info) {
return NT_STATUS_NO_MEMORY;
}
netlogon_creds_des_encrypt(cli->dc, &ntpassword);
}
- init_netr_PasswordInfo(password_info,
- domain,
- logon_parameters,
- 0xdead,
- 0xbeef,
- username,
- clnt_name_slash,
- lmpassword,
- ntpassword);
+ password_info->identity_info.domain_name.string = domain;
+ password_info->identity_info.parameter_control = logon_parameters;
+ password_info->identity_info.logon_id_low = 0xdead;
+ password_info->identity_info.logon_id_high = 0xbeef;
+ password_info->identity_info.account_name.string = username;
+ password_info->identity_info.workstation.string = clnt_name_slash;
+
+ password_info->lmpassword = lmpassword;
+ password_info->ntpassword = ntpassword;
logon->password = password_info;
ZERO_STRUCT(lm);
ZERO_STRUCT(nt);
- network_info = TALLOC_ZERO_P(mem_ctx, struct netr_NetworkInfo);
+ network_info = talloc_zero(mem_ctx, struct netr_NetworkInfo);
if (!network_info) {
return NT_STATUS_NO_MEMORY;
}
nt.length = 24;
nt.data = local_nt_response;
- init_netr_NetworkInfo(network_info,
- domain,
- logon_parameters,
- 0xdead,
- 0xbeef,
- username,
- clnt_name_slash,
- chal,
- nt,
- lm);
+ network_info->identity_info.domain_name.string = domain;
+ network_info->identity_info.parameter_control = logon_parameters;
+ network_info->identity_info.logon_id_low = 0xdead;
+ network_info->identity_info.logon_id_high = 0xbeef;
+ network_info->identity_info.account_name.string = username;
+ network_info->identity_info.workstation.string = clnt_name_slash;
+
+ memcpy(network_info->challenge, chal, 8);
+ network_info->nt = nt;
+ network_info->lm = lm;
logon->network = network_info;
return NT_STATUS_INVALID_INFO_CLASS;
}
- result = rpccli_netr_LogonSamLogon(cli, mem_ctx,
+ status = dcerpc_netr_LogonSamLogon(b, mem_ctx,
cli->srv_name_slash,
- global_myname(),
+ lp_netbios_name(),
&clnt_creds,
&ret_creds,
logon_type,
logon,
validation_level,
&validation,
- &authoritative);
+ &authoritative,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
/* Always check returned credentials */
if (!netlogon_creds_client_check(cli->dc, &ret_creds.cred)) {
return result;
}
+static NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
+ uint16_t validation_level,
+ union netr_Validation *validation,
+ struct netr_SamInfo3 **info3_p)
+{
+ struct netr_SamInfo3 *info3;
+ NTSTATUS status;
+
+ if (validation == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ switch (validation_level) {
+ case 3:
+ if (validation->sam3 == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ info3 = talloc_move(mem_ctx, &validation->sam3);
+ break;
+ case 6:
+ if (validation->sam6 == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
+ if (info3 == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+ status = copy_netr_SamBaseInfo(info3, &validation->sam6->base, &info3->base);
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(info3);
+ return status;
+ }
+
+ info3->sidcount = validation->sam6->sidcount;
+ info3->sids = talloc_move(info3, &validation->sam6->sids);
+ break;
+ default:
+ return NT_STATUS_BAD_VALIDATION_CLASS;
+ }
+
+ *info3_p = info3;
+
+ return NT_STATUS_OK;
+}
/**
* Logon domain user with an 'network' SAM logon
const char *domain,
const char *workstation,
const uint8 chal[8],
+ uint16_t validation_level,
DATA_BLOB lm_response,
DATA_BLOB nt_response,
struct netr_SamInfo3 **info3)
{
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- int validation_level = 3;
+ NTSTATUS status;
const char *workstation_name_slash;
const char *server_name_slash;
- uint8 zeros[16];
struct netr_Authenticator clnt_creds;
struct netr_Authenticator ret_creds;
union netr_LogonLevel *logon = NULL;
union netr_Validation validation;
struct netr_ChallengeResponse lm;
struct netr_ChallengeResponse nt;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
*info3 = NULL;
- ZERO_STRUCT(zeros);
ZERO_STRUCT(ret_creds);
ZERO_STRUCT(lm);
ZERO_STRUCT(nt);
- logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+ logon = talloc_zero(mem_ctx, union netr_LogonLevel);
if (!logon) {
return NT_STATUS_NO_MEMORY;
}
- network_info = TALLOC_ZERO_P(mem_ctx, struct netr_NetworkInfo);
+ network_info = talloc_zero(mem_ctx, struct netr_NetworkInfo);
if (!network_info) {
return NT_STATUS_NO_MEMORY;
}
nt.data = nt_response.data;
nt.length = nt_response.length;
- init_netr_NetworkInfo(network_info,
- domain,
- logon_parameters,
- 0xdead,
- 0xbeef,
- username,
- workstation_name_slash,
- (uint8_t *) chal,
- nt,
- lm);
+ network_info->identity_info.domain_name.string = domain;
+ network_info->identity_info.parameter_control = logon_parameters;
+ network_info->identity_info.logon_id_low = 0xdead;
+ network_info->identity_info.logon_id_high = 0xbeef;
+ network_info->identity_info.account_name.string = username;
+ network_info->identity_info.workstation.string = workstation_name_slash;
+
+ memcpy(network_info->challenge, chal, 8);
+ network_info->nt = nt;
+ network_info->lm = lm;
logon->network = network_info;
/* Marshall data and send request */
- result = rpccli_netr_LogonSamLogon(cli, mem_ctx,
+ status = dcerpc_netr_LogonSamLogon(b, mem_ctx,
server_name_slash,
- global_myname(),
+ lp_netbios_name(),
&clnt_creds,
&ret_creds,
NetlogonNetworkInformation,
logon,
validation_level,
&validation,
- &authoritative);
- if (!NT_STATUS_IS_OK(result)) {
- return result;
+ &authoritative,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
/* Always check returned credentials. */
return NT_STATUS_ACCESS_DENIED;
}
+ if (!NT_STATUS_IS_OK(result)) {
+ return result;
+ }
+
netlogon_creds_decrypt_samlogon(cli->dc, validation_level, &validation);
- *info3 = validation.sam3;
+ result = map_validation_to_info3(mem_ctx, validation_level, &validation, info3);
+ if (!NT_STATUS_IS_OK(result)) {
+ return result;
+ }
return result;
}
const char *domain,
const char *workstation,
const uint8 chal[8],
+ uint16_t validation_level,
DATA_BLOB lm_response,
DATA_BLOB nt_response,
struct netr_SamInfo3 **info3)
{
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- int validation_level = 3;
+ NTSTATUS status;
const char *workstation_name_slash;
const char *server_name_slash;
- uint8 zeros[16];
union netr_LogonLevel *logon = NULL;
struct netr_NetworkInfo *network_info;
uint8_t authoritative;
struct netr_ChallengeResponse lm;
struct netr_ChallengeResponse nt;
uint32_t flags = 0;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
*info3 = NULL;
- ZERO_STRUCT(zeros);
-
ZERO_STRUCT(lm);
ZERO_STRUCT(nt);
- logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+ logon = talloc_zero(mem_ctx, union netr_LogonLevel);
if (!logon) {
return NT_STATUS_NO_MEMORY;
}
- network_info = TALLOC_ZERO_P(mem_ctx, struct netr_NetworkInfo);
+ network_info = talloc_zero(mem_ctx, struct netr_NetworkInfo);
if (!network_info) {
return NT_STATUS_NO_MEMORY;
}
nt.data = nt_response.data;
nt.length = nt_response.length;
- init_netr_NetworkInfo(network_info,
- domain,
- logon_parameters,
- 0xdead,
- 0xbeef,
- username,
- workstation_name_slash,
- (uint8_t *) chal,
- nt,
- lm);
+ network_info->identity_info.domain_name.string = domain;
+ network_info->identity_info.parameter_control = logon_parameters;
+ network_info->identity_info.logon_id_low = 0xdead;
+ network_info->identity_info.logon_id_high = 0xbeef;
+ network_info->identity_info.account_name.string = username;
+ network_info->identity_info.workstation.string = workstation_name_slash;
+
+ memcpy(network_info->challenge, chal, 8);
+ network_info->nt = nt;
+ network_info->lm = lm;
logon->network = network_info;
/* Marshall data and send request */
- result = rpccli_netr_LogonSamLogonEx(cli, mem_ctx,
+ status = dcerpc_netr_LogonSamLogonEx(b, mem_ctx,
server_name_slash,
- global_myname(),
+ lp_netbios_name(),
NetlogonNetworkInformation,
logon,
validation_level,
&validation,
&authoritative,
- &flags);
+ &flags,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
if (!NT_STATUS_IS_OK(result)) {
return result;
}
netlogon_creds_decrypt_samlogon(cli->dc, validation_level, &validation);
- *info3 = validation.sam3;
+ result = map_validation_to_info3(mem_ctx, validation_level, &validation, info3);
+ if (!NT_STATUS_IS_OK(result)) {
+ return result;
+ }
return result;
}
NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *account_name,
const unsigned char orig_trust_passwd_hash[16],
const char *new_trust_pwd_cleartext,
const unsigned char new_trust_passwd_hash[16],
- uint32_t sec_channel_type)
+ enum netr_SchannelType sec_channel_type)
{
- NTSTATUS result;
- uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
+ NTSTATUS result, status;
struct netr_Authenticator clnt_creds, srv_cred;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
- result = rpccli_netlogon_setup_creds(cli,
- cli->desthost, /* server name */
- lp_workgroup(), /* domain */
- global_myname(), /* client name */
- global_myname(), /* machine account name */
- orig_trust_passwd_hash,
- sec_channel_type,
- &neg_flags);
-
- if (!NT_STATUS_IS_OK(result)) {
- DEBUG(3,("rpccli_netlogon_set_trust_password: unable to setup creds (%s)!\n",
- nt_errstr(result)));
- return result;
+ if (!cli->dc) {
+ uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
+ result = rpccli_netlogon_setup_creds(cli,
+ cli->desthost, /* server name */
+ lp_workgroup(), /* domain */
+ lp_netbios_name(), /* client name */
+ account_name, /* machine account name */
+ orig_trust_passwd_hash,
+ sec_channel_type,
+ &neg_flags);
+ if (!NT_STATUS_IS_OK(result)) {
+ DEBUG(3,("rpccli_netlogon_set_trust_password: unable to setup creds (%s)!\n",
+ nt_errstr(result)));
+ return result;
+ }
}
netlogon_creds_client_authenticator(cli->dc, &clnt_creds);
- if (neg_flags & NETLOGON_NEG_PASSWORD_SET2) {
+ if (cli->dc->negotiate_flags & NETLOGON_NEG_PASSWORD_SET2) {
struct netr_CryptPassword new_password;
+ uint32_t old_timeout;
init_netr_CryptPassword(new_trust_pwd_cleartext,
cli->dc->session_key,
&new_password);
- result = rpccli_netr_ServerPasswordSet2(cli, mem_ctx,
+ old_timeout = dcerpc_binding_handle_set_timeout(b, 600000);
+
+ status = dcerpc_netr_ServerPasswordSet2(b, mem_ctx,
cli->srv_name_slash,
cli->dc->account_name,
sec_channel_type,
cli->dc->computer_name,
&clnt_creds,
&srv_cred,
- &new_password);
- if (!NT_STATUS_IS_OK(result)) {
- DEBUG(0,("rpccli_netr_ServerPasswordSet2 failed: %s\n",
- nt_errstr(result)));
- return result;
+ &new_password,
+ &result);
+
+ dcerpc_binding_handle_set_timeout(b, old_timeout);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0,("dcerpc_netr_ServerPasswordSet2 failed: %s\n",
+ nt_errstr(status)));
+ return status;
}
} else {
struct samr_Password new_password;
+ uint32_t old_timeout;
+
memcpy(new_password.hash, new_trust_passwd_hash, sizeof(new_password.hash));
netlogon_creds_des_encrypt(cli->dc, &new_password);
- result = rpccli_netr_ServerPasswordSet(cli, mem_ctx,
+ old_timeout = dcerpc_binding_handle_set_timeout(b, 600000);
+
+ status = dcerpc_netr_ServerPasswordSet(b, mem_ctx,
cli->srv_name_slash,
cli->dc->account_name,
sec_channel_type,
cli->dc->computer_name,
&clnt_creds,
&srv_cred,
- &new_password);
- if (!NT_STATUS_IS_OK(result)) {
- DEBUG(0,("rpccli_netr_ServerPasswordSet failed: %s\n",
- nt_errstr(result)));
- return result;
+ &new_password,
+ &result);
+
+ dcerpc_binding_handle_set_timeout(b, old_timeout);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0,("dcerpc_netr_ServerPasswordSet failed: %s\n",
+ nt_errstr(status)));
+ return status;
}
}
return NT_STATUS_ACCESS_DENIED;
}
+ if (!NT_STATUS_IS_OK(result)) {
+ DEBUG(0,("dcerpc_netr_ServerPasswordSet{2} failed: %s\n",
+ nt_errstr(result)));
+ return result;
+ }
+
return result;
}
git.samba.org / ddiss / samba.git / blobdiff