#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
+#include "../libcli/auth/schannel_state.h"
extern userdom_struct current_user_info;
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
-/*************************************************************************
- init_net_r_req_chal:
- *************************************************************************/
-
-static void init_net_r_req_chal(struct netr_Credential *r,
- struct netr_Credential *srv_chal)
-{
- DEBUG(6,("init_net_r_req_chal: %d\n", __LINE__));
-
- memcpy(r->data, srv_chal->data, sizeof(r->data));
-}
+struct netlogon_server_pipe_state {
+ struct netr_Credential client_challenge;
+ struct netr_Credential server_challenge;
+};
/*******************************************************************
Inits a netr_NETLOGON_INFO_1 structure.
l.in.function_code = r->in.function_code;
l.in.level = r->in.level;
l.in.data = NULL;
- l.out.query = r->out.info;
+ l.out.query = r->out.query;
return _netr_LogonControl2Ex(p, &l);
}
gets a machine password entry. checks access rights of the host.
******************************************************************/
-static NTSTATUS get_md4pw(char *md4pw, const char *mach_acct,
- uint16_t sec_chan_type, uint32_t *rid)
+static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct,
+ uint16_t sec_chan_type, struct dom_sid *sid)
{
struct samu *sampass = NULL;
const uint8 *pass;
return NT_STATUS_LOGON_FAILURE;
}
- memcpy(md4pw, pass, 16);
- dump_data(5, (uint8 *)md4pw, 16);
+ memcpy(md4pw->hash, pass, 16);
+ dump_data(5, md4pw->hash, 16);
- if (rid) {
- *rid = pdb_get_user_rid(sampass);
- }
+ sid_copy(sid, pdb_get_user_sid(sampass));
TALLOC_FREE(sampass);
NTSTATUS _netr_ServerReqChallenge(pipes_struct *p,
struct netr_ServerReqChallenge *r)
{
- if (!p->dc) {
- p->dc = TALLOC_ZERO_P(p, struct dcinfo);
- if (!p->dc) {
- return NT_STATUS_NO_MEMORY;
- }
- } else {
+ struct netlogon_server_pipe_state *pipe_state =
+ talloc_get_type(p->private_data, struct netlogon_server_pipe_state);
+
+ if (pipe_state) {
DEBUG(10,("_netr_ServerReqChallenge: new challenge requested. Clearing old state.\n"));
- ZERO_STRUCTP(p->dc);
+ talloc_free(pipe_state);
+ p->private_data = NULL;
}
- fstrcpy(p->dc->remote_machine, r->in.computer_name);
+ pipe_state = talloc(p, struct netlogon_server_pipe_state);
+ NT_STATUS_HAVE_NO_MEMORY(pipe_state);
- /* Save the client challenge to the server. */
- memcpy(p->dc->clnt_chal.data, r->in.credentials->data,
- sizeof(r->in.credentials->data));
+ pipe_state->client_challenge = *r->in.credentials;
- /* Create a server challenge for the client */
- /* Set this to a random value. */
- generate_random_buffer(p->dc->srv_chal.data, 8);
+ generate_random_buffer(pipe_state->server_challenge.data,
+ sizeof(pipe_state->server_challenge.data));
- /* set up the LSA REQUEST CHALLENGE response */
- init_net_r_req_chal(r->out.return_credentials, &p->dc->srv_chal);
+ *r->out.return_credentials = pipe_state->server_challenge;
- p->dc->challenge_sent = True;
+ p->private_data = pipe_state;
return NT_STATUS_OK;
}
NTSTATUS _netr_ServerAuthenticate(pipes_struct *p,
struct netr_ServerAuthenticate *r)
{
- NTSTATUS status;
- struct netr_Credential srv_chal_out;
-
- if (!p->dc || !p->dc->challenge_sent) {
- return NT_STATUS_ACCESS_DENIED;
- }
-
- status = get_md4pw((char *)p->dc->mach_pw,
- r->in.account_name,
- r->in.secure_channel_type,
- NULL);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("_netr_ServerAuthenticate: get_md4pw failed. Failed to "
- "get password for machine account %s "
- "from client %s: %s\n",
- r->in.account_name,
- r->in.computer_name,
- nt_errstr(status) ));
- /* always return NT_STATUS_ACCESS_DENIED */
- return NT_STATUS_ACCESS_DENIED;
- }
-
- /* From the client / server challenges and md4 password, generate sess key */
- creds_server_init(0, /* No neg flags. */
- p->dc,
- &p->dc->clnt_chal, /* Stored client chal. */
- &p->dc->srv_chal, /* Stored server chal. */
- p->dc->mach_pw,
- &srv_chal_out);
-
- /* Check client credentials are valid. */
- if (!netlogon_creds_server_check(p->dc, r->in.credentials)) {
- DEBUG(0,("_netr_ServerAuthenticate: netlogon_creds_server_check failed. Rejecting auth "
- "request from client %s machine account %s\n",
- r->in.computer_name,
- r->in.account_name));
- return NT_STATUS_ACCESS_DENIED;
- }
+ struct netr_ServerAuthenticate3 a;
+ uint32_t negotiate_flags = 0;
+ uint32_t rid;
- fstrcpy(p->dc->mach_acct, r->in.account_name);
- fstrcpy(p->dc->remote_machine, r->in.computer_name);
- p->dc->authenticated = True;
+ a.in.server_name = r->in.server_name;
+ a.in.account_name = r->in.account_name;
+ a.in.secure_channel_type = r->in.secure_channel_type;
+ a.in.computer_name = r->in.computer_name;
+ a.in.credentials = r->in.credentials;
+ a.in.negotiate_flags = &negotiate_flags;
- /* set up the LSA AUTH response */
- /* Return the server credentials. */
+ a.out.return_credentials = r->out.return_credentials;
+ a.out.rid = &rid;
+ a.out.negotiate_flags = &negotiate_flags;
- memcpy(r->out.return_credentials->data, &srv_chal_out.data,
- sizeof(r->out.return_credentials->data));
+ return _netr_ServerAuthenticate3(p, &a);
- return NT_STATUS_OK;
}
/*************************************************************************
{
NTSTATUS status;
uint32_t srv_flgs;
- struct netr_Credential srv_chal_out;
+ /* r->in.negotiate_flags is an aliased pointer to r->out.negotiate_flags,
+ * so use a copy to avoid destroying the client values. */
+ uint32_t in_neg_flags = *r->in.negotiate_flags;
const char *fn;
+ struct dom_sid sid;
+ struct samr_Password mach_pwd;
+ struct netlogon_creds_CredentialState *creds;
+ struct netlogon_server_pipe_state *pipe_state =
+ talloc_get_type(p->private_data, struct netlogon_server_pipe_state);
/* According to Microsoft (see bugid #6099)
* Windows 7 looks at the negotiate_flags
* returned in this structure *even if the
- * call fails with access denied ! So in order
+ * call fails with access denied* ! So in order
* to allow Win7 to connect to a Samba NT style
* PDC we set the flags before we know if it's
* an error or not.
NETLOGON_NEG_REDO |
NETLOGON_NEG_PASSWORD_CHANGE_REFUSAL;
+ /* Ensure we support strong (128-bit) keys. */
+ if (in_neg_flags & NETLOGON_NEG_STRONG_KEYS) {
+ srv_flgs |= NETLOGON_NEG_STRONG_KEYS;
+ }
+
if (lp_server_schannel() != false) {
srv_flgs |= NETLOGON_NEG_SCHANNEL;
}
- *r->out.negotiate_flags = srv_flgs;
-
switch (p->hdr_req.opnum) {
+ case NDR_NETR_SERVERAUTHENTICATE:
+ fn = "_netr_ServerAuthenticate";
+ break;
case NDR_NETR_SERVERAUTHENTICATE2:
fn = "_netr_ServerAuthenticate2";
break;
/* We use this as the key to store the creds: */
/* r->in.computer_name */
- if (!p->dc || !p->dc->challenge_sent) {
+ if (!pipe_state) {
DEBUG(0,("%s: no challenge sent to client %s\n", fn,
r->in.computer_name));
- return NT_STATUS_ACCESS_DENIED;
+ status = NT_STATUS_ACCESS_DENIED;
+ goto out;
}
if ( (lp_server_schannel() == true) &&
- ((*r->in.negotiate_flags & NETLOGON_NEG_SCHANNEL) == 0) ) {
+ ((in_neg_flags & NETLOGON_NEG_SCHANNEL) == 0) ) {
/* schannel must be used, but client did not offer it. */
DEBUG(0,("%s: schannel required but client failed "
"to offer it. Client was %s\n",
fn, r->in.account_name));
- return NT_STATUS_ACCESS_DENIED;
+ status = NT_STATUS_ACCESS_DENIED;
+ goto out;
}
- status = get_md4pw((char *)p->dc->mach_pw,
+ status = get_md4pw(&mach_pwd,
r->in.account_name,
r->in.secure_channel_type,
- r->out.rid);
+ &sid);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("%s: failed to get machine password for "
"account %s: %s\n",
fn, r->in.account_name, nt_errstr(status) ));
/* always return NT_STATUS_ACCESS_DENIED */
- return NT_STATUS_ACCESS_DENIED;
+ status = NT_STATUS_ACCESS_DENIED;
+ goto out;
}
/* From the client / server challenges and md4 password, generate sess key */
- creds_server_init(*r->in.negotiate_flags,
- p->dc,
- &p->dc->clnt_chal, /* Stored client chal. */
- &p->dc->srv_chal, /* Stored server chal. */
- p->dc->mach_pw,
- &srv_chal_out);
-
/* Check client credentials are valid. */
- if (!netlogon_creds_server_check(p->dc, r->in.credentials)) {
+ creds = netlogon_creds_server_init(p->mem_ctx,
+ r->in.account_name,
+ r->in.computer_name,
+ r->in.secure_channel_type,
+ &pipe_state->client_challenge,
+ &pipe_state->server_challenge,
+ &mach_pwd,
+ r->in.credentials,
+ r->out.return_credentials,
+ *r->in.negotiate_flags);
+ if (!creds) {
DEBUG(0,("%s: netlogon_creds_server_check failed. Rejecting auth "
"request from client %s machine account %s\n",
fn, r->in.computer_name,
r->in.account_name));
- return NT_STATUS_ACCESS_DENIED;
+ status = NT_STATUS_ACCESS_DENIED;
+ goto out;
}
- /* set up the LSA AUTH 2 response */
- memcpy(r->out.return_credentials->data, &srv_chal_out.data,
- sizeof(r->out.return_credentials->data));
-
- fstrcpy(p->dc->mach_acct, r->in.account_name);
- fstrcpy(p->dc->remote_machine, r->in.computer_name);
- fstrcpy(p->dc->domain, lp_workgroup() );
- p->dc->authenticated = True;
+ creds->sid = sid_dup_talloc(creds, &sid);
+ if (!creds->sid) {
+ status = NT_STATUS_NO_MEMORY;
+ goto out;
+ }
/* Store off the state so we can continue after client disconnect. */
become_root();
- secrets_store_schannel_session_info(p->mem_ctx,
- r->in.computer_name,
- p->dc);
+ status = schannel_store_session_key(p->mem_ctx, creds);
unbecome_root();
- return NT_STATUS_OK;
+ if (!NT_STATUS_IS_OK(status)) {
+ goto out;
+ }
+
+ sid_peek_rid(&sid, r->out.rid);
+
+ status = NT_STATUS_OK;
+
+ out:
+
+ *r->out.negotiate_flags = srv_flgs;
+ return status;
}
/*************************************************************************
return _netr_ServerAuthenticate3(p, &a);
}
+/*************************************************************************
+ *************************************************************************/
+
+static NTSTATUS netr_creds_server_step_check(pipes_struct *p,
+ TALLOC_CTX *mem_ctx,
+ const char *computer_name,
+ struct netr_Authenticator *received_authenticator,
+ struct netr_Authenticator *return_authenticator,
+ struct netlogon_creds_CredentialState **creds_out)
+{
+ NTSTATUS status;
+ struct tdb_context *tdb;
+ bool schannel_global_required = (lp_server_schannel() == true) ? true:false;
+ bool schannel_in_use = (p->auth.auth_type == PIPE_AUTH_TYPE_SCHANNEL) ? true:false; /* &&
+ (p->auth.auth_level == PIPE_AUTH_LEVEL_INTEGRITY ||
+ p->auth.auth_level == PIPE_AUTH_LEVEL_PRIVACY); */
+
+ tdb = open_schannel_session_store(mem_ctx);
+ if (!tdb) {
+ return NT_STATUS_ACCESS_DENIED;
+ }
+
+ status = schannel_creds_server_step_check_tdb(tdb, mem_ctx,
+ computer_name,
+ schannel_global_required,
+ schannel_in_use,
+ received_authenticator,
+ return_authenticator,
+ creds_out);
+ tdb_close(tdb);
+
+ return status;
+}
+
/*************************************************************************
_netr_ServerPasswordSet
*************************************************************************/
struct netr_ServerPasswordSet *r)
{
NTSTATUS status = NT_STATUS_OK;
- fstring remote_machine;
struct samu *sampass=NULL;
bool ret = False;
- unsigned char pwd[16];
int i;
uint32 acct_ctrl;
- struct netr_Authenticator cred_out;
const uchar *old_pw;
+ struct netlogon_creds_CredentialState *creds;
DEBUG(5,("_netr_ServerPasswordSet: %d\n", __LINE__));
- /* We need the remote machine name for the creds lookup. */
- fstrcpy(remote_machine, r->in.computer_name);
-
- if ( (lp_server_schannel() == True) && (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) ) {
- /* 'server schannel = yes' should enforce use of
- schannel, the client did offer it in auth2, but
- obviously did not use it. */
- DEBUG(0,("_netr_ServerPasswordSet: client %s not using schannel for netlogon\n",
- remote_machine ));
- return NT_STATUS_ACCESS_DENIED;
- }
-
- if (!p->dc) {
- /* Restore the saved state of the netlogon creds. */
- become_root();
- ret = secrets_restore_schannel_session_info(p, remote_machine,
- &p->dc);
- unbecome_root();
- if (!ret) {
- return NT_STATUS_INVALID_HANDLE;
- }
- }
-
- if (!p->dc || !p->dc->authenticated) {
- return NT_STATUS_INVALID_HANDLE;
- }
-
- DEBUG(3,("_netr_ServerPasswordSet: Server Password Set by remote machine:[%s] on account [%s]\n",
- remote_machine, p->dc->mach_acct));
+ become_root();
+ status = netr_creds_server_step_check(p, p->mem_ctx,
+ r->in.computer_name,
+ r->in.credential,
+ r->out.return_authenticator,
+ &creds);
+ unbecome_root();
- /* Step the creds chain forward. */
- if (!netlogon_creds_server_step(p->dc, r->in.credential, &cred_out)) {
+ if (!NT_STATUS_IS_OK(status)) {
DEBUG(2,("_netr_ServerPasswordSet: netlogon_creds_server_step failed. Rejecting auth "
"request from client %s machine account %s\n",
- remote_machine, p->dc->mach_acct ));
- return NT_STATUS_INVALID_PARAMETER;
+ r->in.computer_name, creds->computer_name));
+ TALLOC_FREE(creds);
+ return status;
}
- /* We must store the creds state after an update. */
+ DEBUG(3,("_netr_ServerPasswordSet: Server Password Set by remote machine:[%s] on account [%s]\n",
+ r->in.computer_name, creds->computer_name));
+
sampass = samu_new( NULL );
if (!sampass) {
return NT_STATUS_NO_MEMORY;
}
become_root();
- secrets_store_schannel_session_info(p, remote_machine, p->dc);
- ret = pdb_getsampwnam(sampass, p->dc->mach_acct);
+ ret = pdb_getsampwnam(sampass, creds->account_name);
unbecome_root();
if (!ret) {
}
/* Woah - what does this to to the credential chain ? JRA */
- cred_hash3(pwd, r->in.new_password->hash, p->dc->sess_key, 0);
+ netlogon_creds_des_decrypt(creds, r->in.new_password);
DEBUG(100,("_netr_ServerPasswordSet: new given value was :\n"));
- for(i = 0; i < sizeof(pwd); i++)
- DEBUG(100,("%02X ", pwd[i]));
+ for(i = 0; i < sizeof(r->in.new_password->hash); i++)
+ DEBUG(100,("%02X ", r->in.new_password->hash[i]));
DEBUG(100,("\n"));
old_pw = pdb_get_nt_passwd(sampass);
- if (old_pw && memcmp(pwd, old_pw, 16) == 0) {
+ if (old_pw && memcmp(r->in.new_password->hash, old_pw, 16) == 0) {
/* Avoid backend modificiations and other fun if the
client changed the password to the *same thing* */
return NT_STATUS_NO_MEMORY;
}
- if (!pdb_set_nt_passwd(sampass, pwd, PDB_CHANGED)) {
+ if (!pdb_set_nt_passwd(sampass, r->in.new_password->hash, PDB_CHANGED)) {
TALLOC_FREE(sampass);
return NT_STATUS_NO_MEMORY;
}
unbecome_root();
}
- /* set up the LSA Server Password Set response */
-
- memcpy(r->out.return_authenticator, &cred_out,
- sizeof(*(r->out.return_authenticator)));
-
TALLOC_FREE(sampass);
return status;
}
NTSTATUS _netr_LogonSamLogoff(pipes_struct *p,
struct netr_LogonSamLogoff *r)
{
- if ( (lp_server_schannel() == True) && (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) ) {
- /* 'server schannel = yes' should enforce use of
- schannel, the client did offer it in auth2, but
- obviously did not use it. */
- DEBUG(0,("_netr_LogonSamLogoff: client %s not using schannel for netlogon\n",
- get_remote_machine_name() ));
- return NT_STATUS_ACCESS_DENIED;
- }
-
-
- /* Using the remote machine name for the creds store: */
- /* r->in.computer_name */
-
- if (!p->dc) {
- /* Restore the saved state of the netlogon creds. */
- bool ret;
-
- become_root();
- ret = secrets_restore_schannel_session_info(
- p, r->in.computer_name, &p->dc);
- unbecome_root();
- if (!ret) {
- return NT_STATUS_INVALID_HANDLE;
- }
- }
-
- if (!p->dc || !p->dc->authenticated) {
- return NT_STATUS_INVALID_HANDLE;
- }
-
- /* checks and updates credentials. creates reply credentials */
- if (!netlogon_creds_server_step(p->dc, r->in.credential, r->out.return_authenticator)) {
- DEBUG(2,("_netr_LogonSamLogoff: netlogon_creds_server_step failed. Rejecting auth "
- "request from client %s machine account %s\n",
- r->in.computer_name, p->dc->mach_acct ));
- return NT_STATUS_INVALID_PARAMETER;
- }
+ NTSTATUS status;
+ struct netlogon_creds_CredentialState *creds;
- /* We must store the creds state after an update. */
become_root();
- secrets_store_schannel_session_info(p, r->in.computer_name, p->dc);
+ status = netr_creds_server_step_check(p, p->mem_ctx,
+ r->in.computer_name,
+ r->in.credential,
+ r->out.return_authenticator,
+ &creds);
unbecome_root();
- return NT_STATUS_OK;
+ return status;
}
/*************************************************************************
- _netr_LogonSamLogon
+ _netr_LogonSamLogon_base
*************************************************************************/
-NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
- struct netr_LogonSamLogon *r)
+static NTSTATUS _netr_LogonSamLogon_base(pipes_struct *p,
+ struct netr_LogonSamLogonEx *r,
+ struct netlogon_creds_CredentialState *creds)
{
NTSTATUS status = NT_STATUS_OK;
- struct netr_SamInfo3 *sam3 = NULL;
union netr_LogonLevel *logon = r->in.logon;
- fstring nt_username, nt_domain, nt_workstation;
+ const char *nt_username, *nt_domain, *nt_workstation;
auth_usersupplied_info *user_info = NULL;
auth_serversupplied_info *server_info = NULL;
struct auth_context *auth_context = NULL;
process_creds = true;
fn = "_netr_LogonSamLogon";
break;
+ case NDR_NETR_LOGONSAMLOGONWITHFLAGS:
+ process_creds = true;
+ fn = "_netr_LogonSamLogonWithFlags";
+ break;
case NDR_NETR_LOGONSAMLOGONEX:
+ process_creds = false;
fn = "_netr_LogonSamLogonEx";
+ break;
default:
- fn = "";
- process_creds = false;
- }
-
- if ( (lp_server_schannel() == True) && (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) ) {
- /* 'server schannel = yes' should enforce use of
- schannel, the client did offer it in auth2, but
- obviously did not use it. */
- DEBUG(0,("%s: client %s not using schannel for netlogon\n",
- fn, get_remote_machine_name() ));
- return NT_STATUS_ACCESS_DENIED;
- }
-
- sam3 = TALLOC_ZERO_P(p->mem_ctx, struct netr_SamInfo3);
- if (!sam3) {
- return NT_STATUS_NO_MEMORY;
+ return NT_STATUS_INTERNAL_ERROR;
}
- /* store the user information, if there is any. */
- r->out.validation->sam3 = sam3;
*r->out.authoritative = true; /* authoritative response */
- if (r->in.validation_level != 2 && r->in.validation_level != 3) {
- DEBUG(0,("%s: bad validation_level value %d.\n",
- fn, (int)r->in.validation_level));
- return NT_STATUS_ACCESS_DENIED;
- }
-
- if (process_creds) {
-
- /* Get the remote machine name for the creds store. */
- /* Note this is the remote machine this request is coming from (member server),
- not neccessarily the workstation name the user is logging onto.
- */
-
- if (!p->dc) {
- /* Restore the saved state of the netlogon creds. */
- bool ret;
-
- become_root();
- ret = secrets_restore_schannel_session_info(
- p, r->in.computer_name, &p->dc);
- unbecome_root();
- if (!ret) {
- return NT_STATUS_INVALID_HANDLE;
- }
- }
- if (!p->dc || !p->dc->authenticated) {
- return NT_STATUS_INVALID_HANDLE;
+ switch (r->in.validation_level) {
+ case 2:
+ r->out.validation->sam2 = TALLOC_ZERO_P(p->mem_ctx, struct netr_SamInfo2);
+ if (!r->out.validation->sam2) {
+ return NT_STATUS_NO_MEMORY;
}
-
- /* checks and updates credentials. creates reply credentials */
- if (!netlogon_creds_server_step(p->dc, r->in.credential, r->out.return_authenticator)) {
- DEBUG(2,("%s: creds_server_step failed. Rejecting auth "
- "request from client %s machine account %s\n",
- fn, r->in.computer_name, p->dc->mach_acct ));
- return NT_STATUS_INVALID_PARAMETER;
+ break;
+ case 3:
+ r->out.validation->sam3 = TALLOC_ZERO_P(p->mem_ctx, struct netr_SamInfo3);
+ if (!r->out.validation->sam3) {
+ return NT_STATUS_NO_MEMORY;
}
-
- /* We must store the creds state after an update. */
- become_root();
- secrets_store_schannel_session_info(p, r->in.computer_name, p->dc);
- unbecome_root();
+ break;
+ default:
+ DEBUG(0,("%s: bad validation_level value %d.\n",
+ fn, (int)r->in.validation_level));
+ return NT_STATUS_INVALID_INFO_CLASS;
}
switch (r->in.logon_level) {
case NetlogonInteractiveInformation:
- fstrcpy(nt_username,
- logon->password->identity_info.account_name.string);
- fstrcpy(nt_domain,
- logon->password->identity_info.domain_name.string);
- fstrcpy(nt_workstation,
- logon->password->identity_info.workstation.string);
+ nt_username = logon->password->identity_info.account_name.string;
+ nt_domain = logon->password->identity_info.domain_name.string;
+ nt_workstation = logon->password->identity_info.workstation.string;
DEBUG(3,("SAM Logon (Interactive). Domain:[%s]. ", lp_workgroup()));
break;
case NetlogonNetworkInformation:
- fstrcpy(nt_username,
- logon->network->identity_info.account_name.string);
- fstrcpy(nt_domain,
- logon->network->identity_info.domain_name.string);
- fstrcpy(nt_workstation,
- logon->network->identity_info.workstation.string);
+ nt_username = logon->network->identity_info.account_name.string;
+ nt_domain = logon->network->identity_info.domain_name.string;
+ nt_workstation = logon->network->identity_info.workstation.string;
DEBUG(3,("SAM Logon (Network). Domain:[%s]. ", lp_workgroup()));
break;
chal,
logon->password->lmpassword.hash,
logon->password->ntpassword.hash,
- p->dc->sess_key)) {
+ creds->session_key)) {
status = NT_STATUS_NO_MEMORY;
}
break;
if (process_creds) {
/* Get the pipe session key from the creds. */
- memcpy(pipe_session_key, p->dc->sess_key, 16);
+ memcpy(pipe_session_key, creds->session_key, 16);
} else {
/* Get the pipe session key from the schannel. */
if ((p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL)
memcpy(pipe_session_key, p->auth.a_u.schannel_auth->sess_key, 16);
}
- status = serverinfo_to_SamInfo3(server_info, pipe_session_key, 16, sam3);
+ switch (r->in.validation_level) {
+ case 2:
+ status = serverinfo_to_SamInfo2(server_info, pipe_session_key, 16,
+ r->out.validation->sam2);
+ break;
+ case 3:
+ status = serverinfo_to_SamInfo3(server_info, pipe_session_key, 16,
+ r->out.validation->sam3);
+ break;
+ }
+
TALLOC_FREE(server_info);
+
+ return status;
+}
+
+/****************************************************************
+ _netr_LogonSamLogonWithFlags
+****************************************************************/
+
+NTSTATUS _netr_LogonSamLogonWithFlags(pipes_struct *p,
+ struct netr_LogonSamLogonWithFlags *r)
+{
+ NTSTATUS status;
+ struct netlogon_creds_CredentialState *creds;
+ struct netr_LogonSamLogonEx r2;
+ struct netr_Authenticator return_authenticator;
+
+ become_root();
+ status = netr_creds_server_step_check(p, p->mem_ctx,
+ r->in.computer_name,
+ r->in.credential,
+ &return_authenticator,
+ &creds);
+ unbecome_root();
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ r2.in.server_name = r->in.server_name;
+ r2.in.computer_name = r->in.computer_name;
+ r2.in.logon_level = r->in.logon_level;
+ r2.in.logon = r->in.logon;
+ r2.in.validation_level = r->in.validation_level;
+ r2.in.flags = r->in.flags;
+ r2.out.validation = r->out.validation;
+ r2.out.authoritative = r->out.authoritative;
+ r2.out.flags = r->out.flags;
+
+ status = _netr_LogonSamLogon_base(p, &r2, creds);
+
+ *r->out.return_authenticator = return_authenticator;
+
+ return status;
+}
+
+/*************************************************************************
+ _netr_LogonSamLogon
+ *************************************************************************/
+
+NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
+ struct netr_LogonSamLogon *r)
+{
+ NTSTATUS status;
+ struct netr_LogonSamLogonWithFlags r2;
+ uint32_t flags = 0;
+
+ r2.in.server_name = r->in.server_name;
+ r2.in.computer_name = r->in.computer_name;
+ r2.in.credential = r->in.credential;
+ r2.in.logon_level = r->in.logon_level;
+ r2.in.logon = r->in.logon;
+ r2.in.validation_level = r->in.validation_level;
+ r2.in.return_authenticator = r->in.return_authenticator;
+ r2.in.flags = &flags;
+ r2.out.validation = r->out.validation;
+ r2.out.authoritative = r->out.authoritative;
+ r2.out.flags = &flags;
+ r2.out.return_authenticator = r->out.return_authenticator;
+
+ status = _netr_LogonSamLogonWithFlags(p, &r2);
+
return status;
}
NTSTATUS _netr_LogonSamLogonEx(pipes_struct *p,
struct netr_LogonSamLogonEx *r)
{
- struct netr_LogonSamLogon q;
+ NTSTATUS status;
+ struct netlogon_creds_CredentialState *creds;
+
+ become_root();
+ status = schannel_fetch_session_key(p->mem_ctx, r->in.computer_name, &creds);
+ unbecome_root();
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
/* Only allow this if the pipe is protected. */
if (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) {
return NT_STATUS_INVALID_PARAMETER;
}
- q.in.server_name = r->in.server_name;
- q.in.computer_name = r->in.computer_name;
- q.in.logon_level = r->in.logon_level;
- q.in.logon = r->in.logon;
- q.in.validation_level = r->in.validation_level;
- /* we do not handle the flags */
- /* = r->in.flags; */
-
- q.out.validation = r->out.validation;
- q.out.authoritative = r->out.authoritative;
- /* we do not handle the flags */
- /* = r->out.flags; */
+ status = _netr_LogonSamLogon_base(p, r, creds);
+ TALLOC_FREE(creds);
- return _netr_LogonSamLogon(p, &q);
+ return status;
}
/*************************************************************************
/****************************************************************
****************************************************************/
-NTSTATUS _netr_LogonSamLogonWithFlags(pipes_struct *p,
- struct netr_LogonSamLogonWithFlags *r)
-{
- p->rng_fault_state = true;
- return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
NTSTATUS _netr_ServerGetTrustInfo(pipes_struct *p,
struct netr_ServerGetTrustInfo *r)
{
git.samba.org / ira / wip.git / blobdiff