#include "libsmb/libsmb.h"
#include "../libcli/smb/smbXcli_base.h"
#include "lib/param/loadparm.h"
+#include "libcli/auth/netlogon_creds_cli.h"
+#include "auth/credentials/credentials.h"
/****************************************************************
****************************************************************/
struct libnet_JoinCtx *r,
struct cli_state *cli)
{
- struct rpc_pipe_client *pipe_hnd = NULL;
- unsigned char orig_trust_passwd_hash[16];
- unsigned char new_trust_passwd_hash[16];
+ TALLOC_CTX *frame = talloc_stackframe();
+ struct rpc_pipe_client *netlogon_pipe = NULL;
+ struct netlogon_creds_cli_context *netlogon_creds = NULL;
+ struct samr_Password current_nt_hash;
+ const char *account_name = NULL;
NTSTATUS status;
status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon,
- &pipe_hnd);
+ &netlogon_pipe);
if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(frame);
return status;
}
r->in.machine_password = generate_random_password(mem_ctx,
DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH,
DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
- NT_STATUS_HAVE_NO_MEMORY(r->in.machine_password);
+ if (r->in.machine_password == NULL) {
+ TALLOC_FREE(frame);
+ return NT_STATUS_NO_MEMORY;
+ }
}
- E_md4hash(r->in.machine_password, new_trust_passwd_hash);
-
/* according to WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED */
- E_md4hash(r->in.admin_password, orig_trust_passwd_hash);
+ E_md4hash(r->in.admin_password, current_nt_hash.hash);
- status = rpccli_netlogon_set_trust_password(pipe_hnd, mem_ctx,
- r->in.machine_name,
- orig_trust_passwd_hash,
- r->in.machine_password,
- new_trust_passwd_hash,
- r->in.secure_channel_type);
+ account_name = talloc_asprintf(frame, "%s$",
+ r->in.machine_name);
+ if (account_name == NULL) {
+ TALLOC_FREE(frame);
+ return NT_STATUS_NO_MEMORY;
+ }
- return status;
+ status = rpccli_create_netlogon_creds(netlogon_pipe->desthost,
+ r->in.domain_name,
+ account_name,
+ r->in.secure_channel_type,
+ r->in.msg_ctx,
+ frame,
+ &netlogon_creds);
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(frame);
+ return status;
+ }
+
+ status = rpccli_setup_netlogon_creds(cli,
+ netlogon_creds,
+ true, /* force_reauth */
+ current_nt_hash,
+ NULL); /* previous_nt_hash */
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(frame);
+ return status;
+ }
+
+ status = netlogon_creds_cli_ServerPasswordSet(netlogon_creds,
+ netlogon_pipe->binding_handle,
+ r->in.machine_password,
+ NULL); /* new_version */
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(frame);
+ return status;
+ }
+
+ TALLOC_FREE(frame);
+ return NT_STATUS_OK;
}
/****************************************************************
/****************************************************************
****************************************************************/
-NTSTATUS libnet_join_ok(const char *netbios_domain_name,
- const char *machine_name,
+NTSTATUS libnet_join_ok(struct messaging_context *msg_ctx,
+ const char *netbios_domain_name,
const char *dc_name,
const bool use_kerberos)
{
- uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS |
- NETLOGON_NEG_SUPPORTS_AES;
+ TALLOC_CTX *frame = talloc_stackframe();
struct cli_state *cli = NULL;
- struct rpc_pipe_client *pipe_hnd = NULL;
struct rpc_pipe_client *netlogon_pipe = NULL;
+ struct netlogon_creds_cli_context *netlogon_creds = NULL;
+ struct netlogon_creds_CredentialState *creds = NULL;
+ uint32_t netlogon_flags = 0;
+ enum netr_SchannelType sec_chan_type = 0;
NTSTATUS status;
char *machine_password = NULL;
- char *machine_account = NULL;
+ const char *machine_name = NULL;
+ const char *machine_account = NULL;
int flags = 0;
+ struct samr_Password current_nt_hash;
+ struct samr_Password *previous_nt_hash = NULL;
+ bool ok;
if (!dc_name) {
+ TALLOC_FREE(frame);
return NT_STATUS_INVALID_PARAMETER;
}
if (!secrets_init()) {
+ TALLOC_FREE(frame);
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
- machine_password = secrets_fetch_machine_password(netbios_domain_name,
- NULL, NULL);
- if (!machine_password) {
- return NT_STATUS_NO_TRUST_LSA_SECRET;
+ ok = get_trust_pw_clear(netbios_domain_name,
+ &machine_password,
+ &machine_name,
+ &sec_chan_type);
+ if (!ok) {
+ TALLOC_FREE(frame);
+ return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
- if (asprintf(&machine_account, "%s$", machine_name) == -1) {
+ machine_account = talloc_asprintf(frame, "%s$", machine_name);
+ if (machine_account == NULL) {
SAFE_FREE(machine_password);
- return NT_STATUS_NO_MEMORY;
+ SAFE_FREE(previous_nt_hash);
+ TALLOC_FREE(frame);
+ return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
if (use_kerberos) {
NULL, 0,
"IPC$", "IPC",
machine_account,
- NULL,
+ netbios_domain_name,
machine_password,
flags,
SMB_SIGNING_DEFAULT);
- free(machine_account);
- free(machine_password);
+
+ E_md4hash(machine_password, current_nt_hash.hash);
+ SAFE_FREE(machine_password);
if (!NT_STATUS_IS_OK(status)) {
status = cli_full_connection(&cli, NULL,
}
if (!NT_STATUS_IS_OK(status)) {
+ SAFE_FREE(previous_nt_hash);
+ TALLOC_FREE(frame);
return status;
}
- status = get_schannel_session_key(cli, netbios_domain_name,
- &neg_flags, &netlogon_pipe);
+ status = rpccli_create_netlogon_creds(dc_name,
+ netbios_domain_name,
+ machine_account,
+ sec_chan_type,
+ msg_ctx,
+ frame,
+ &netlogon_creds);
if (!NT_STATUS_IS_OK(status)) {
- if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_NETWORK_RESPONSE)) {
- cli_shutdown(cli);
- return NT_STATUS_OK;
- }
+ SAFE_FREE(previous_nt_hash);
+ cli_shutdown(cli);
+ TALLOC_FREE(frame);
+ return status;
+ }
- DEBUG(0,("libnet_join_ok: failed to get schannel session "
- "key from server %s for domain %s. Error was %s\n",
- smbXcli_conn_remote_name(cli->conn),
- netbios_domain_name, nt_errstr(status)));
+ status = rpccli_setup_netlogon_creds(cli,
+ netlogon_creds,
+ true, /* force_reauth */
+ current_nt_hash,
+ previous_nt_hash);
+ SAFE_FREE(previous_nt_hash);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0,("connect_to_domain_password_server: "
+ "unable to open the domain client session to "
+ "machine %s. Flags[0x%08X] Error was : %s.\n",
+ dc_name, (unsigned)netlogon_flags,
+ nt_errstr(status)));
cli_shutdown(cli);
+ TALLOC_FREE(frame);
return status;
}
- if (!lp_client_schannel()) {
+ status = netlogon_creds_cli_get(netlogon_creds,
+ talloc_tos(),
+ &creds);
+ if (!NT_STATUS_IS_OK(status)) {
cli_shutdown(cli);
+ TALLOC_FREE(frame);
+ return status;
+ }
+ netlogon_flags = creds->negotiate_flags;
+ TALLOC_FREE(creds);
+
+ if (!(netlogon_flags & NETLOGON_NEG_AUTHENTICATED_RPC)) {
+ cli_shutdown(cli);
+ TALLOC_FREE(frame);
return NT_STATUS_OK;
}
status = cli_rpc_pipe_open_schannel_with_key(
cli, &ndr_table_netlogon, NCACN_NP,
- DCERPC_AUTH_LEVEL_PRIVACY,
- netbios_domain_name, &netlogon_pipe->dc, &pipe_hnd);
+ netbios_domain_name,
+ netlogon_creds, &netlogon_pipe);
- cli_shutdown(cli);
+ TALLOC_FREE(netlogon_pipe);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("libnet_join_ok: failed to open schannel session "
"Error was %s\n",
smbXcli_conn_remote_name(cli->conn),
netbios_domain_name, nt_errstr(status)));
+ cli_shutdown(cli);
+ TALLOC_FREE(frame);
return status;
}
+ cli_shutdown(cli);
+ TALLOC_FREE(frame);
return NT_STATUS_OK;
}
{
NTSTATUS status;
- status = libnet_join_ok(r->out.netbios_domain_name,
- r->in.machine_name,
+ status = libnet_join_ok(r->in.msg_ctx,
+ r->out.netbios_domain_name,
r->in.dc_name,
r->in.use_kerberos);
if (!NT_STATUS_IS_OK(status)) {
git.samba.org / samba.git / blobdiff