s3-netlogon: use WERRORs in NETLOGON_INFO structures.
[ira/wip.git] / source3 / rpc_server / srv_netlog_nt.c
index 4131fa88eb7121602e637b076cfdc51a82da17b8..f21c80e327013d9d5fb1c58aaa95d9e50abe42eb 100644 (file)
 
 #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
 
-/*******************************************************************
- Inits a netr_NETLOGON_INFO_1 structure.
-********************************************************************/
-
-static void init_netlogon_info1(struct netr_NETLOGON_INFO_1 *r,
-                               uint32_t flags,
-                               uint32_t pdc_connection_status)
-{
-       r->flags = flags;
-       r->pdc_connection_status = pdc_connection_status;
-}
-
-/*******************************************************************
- Inits a netr_NETLOGON_INFO_2 structure.
-********************************************************************/
-
-static void init_netlogon_info2(struct netr_NETLOGON_INFO_2 *r,
-                               uint32_t flags,
-                               uint32_t pdc_connection_status,
-                               const char *trusted_dc_name,
-                               uint32_t tc_connection_status)
-{
-       r->flags = flags;
-       r->pdc_connection_status = pdc_connection_status;
-       r->trusted_dc_name = trusted_dc_name;
-       r->tc_connection_status = tc_connection_status;
-}
-
-/*******************************************************************
- Inits a netr_NETLOGON_INFO_3 structure.
-********************************************************************/
-
-static void init_netlogon_info3(struct netr_NETLOGON_INFO_3 *r,
-                               uint32_t flags,
-                               uint32_t logon_attempts)
-{
-       r->flags = flags;
-       r->logon_attempts = logon_attempts;
-}
+struct netlogon_server_pipe_state {
+       struct netr_Credential client_challenge;
+       struct netr_Credential server_challenge;
+};
 
 /*************************************************************************
  _netr_LogonControl
@@ -135,10 +101,10 @@ WERROR _netr_LogonControl2(pipes_struct *p,
 WERROR _netr_LogonControl2Ex(pipes_struct *p,
                             struct netr_LogonControl2Ex *r)
 {
-        uint32 flags = 0x0;
-        uint32 pdc_connection_status = 0x0;
-        uint32 logon_attempts = 0x0;
-        uint32 tc_status;
+       uint32_t flags = 0x0;
+       WERROR pdc_connection_status = WERR_OK;
+       uint32_t logon_attempts = 0x0;
+       WERROR tc_status;
        fstring dc_name2;
        const char *dc_name = NULL;
        struct sockaddr_storage dc_ss;
@@ -162,7 +128,7 @@ WERROR _netr_LogonControl2Ex(pipes_struct *p,
                        return WERR_INVALID_PARAM;
        }
 
-       tc_status = W_ERROR_V(WERR_NO_SUCH_DOMAIN);
+       tc_status = WERR_NO_SUCH_DOMAIN;
 
        switch (r->in.function_code) {
                case NETLOGON_CONTROL_TC_QUERY:
@@ -172,7 +138,7 @@ WERROR _netr_LogonControl2Ex(pipes_struct *p,
                                break;
 
                        if ( !get_dc_name( domain, NULL, dc_name2, &dc_ss ) ) {
-                               tc_status = W_ERROR_V(WERR_NO_LOGON_SERVERS);
+                               tc_status = WERR_NO_LOGON_SERVERS;
                                break;
                        }
 
@@ -181,7 +147,7 @@ WERROR _netr_LogonControl2Ex(pipes_struct *p,
                                return WERR_NOMEM;
                        }
 
-                       tc_status = W_ERROR_V(WERR_OK);
+                       tc_status = WERR_OK;
 
                        break;
 
@@ -192,7 +158,7 @@ WERROR _netr_LogonControl2Ex(pipes_struct *p,
                                break;
 
                        if ( !get_dc_name( domain, NULL, dc_name2, &dc_ss ) ) {
-                               tc_status = W_ERROR_V(WERR_NO_LOGON_SERVERS);
+                               tc_status = WERR_NO_LOGON_SERVERS;
                                break;
                        }
 
@@ -201,7 +167,7 @@ WERROR _netr_LogonControl2Ex(pipes_struct *p,
                                return WERR_NOMEM;
                        }
 
-                       tc_status = W_ERROR_V(WERR_OK);
+                       tc_status = WERR_OK;
 
                        break;
 
@@ -219,29 +185,29 @@ WERROR _netr_LogonControl2Ex(pipes_struct *p,
                        info1 = TALLOC_ZERO_P(p->mem_ctx, struct netr_NETLOGON_INFO_1);
                        W_ERROR_HAVE_NO_MEMORY(info1);
 
-                       init_netlogon_info1(info1,
-                                           flags,
-                                           pdc_connection_status);
+                       info1->flags                    = flags;
+                       info1->pdc_connection_status    = pdc_connection_status;
+
                        r->out.query->info1 = info1;
                        break;
                case 2:
                        info2 = TALLOC_ZERO_P(p->mem_ctx, struct netr_NETLOGON_INFO_2);
                        W_ERROR_HAVE_NO_MEMORY(info2);
 
-                       init_netlogon_info2(info2,
-                                           flags,
-                                           pdc_connection_status,
-                                           dc_name,
-                                           tc_status);
+                       info2->flags                    = flags;
+                       info2->pdc_connection_status    = pdc_connection_status;
+                       info2->trusted_dc_name          = dc_name;
+                       info2->tc_connection_status     = tc_status;
+
                        r->out.query->info2 = info2;
                        break;
                case 3:
                        info3 = TALLOC_ZERO_P(p->mem_ctx, struct netr_NETLOGON_INFO_3);
                        W_ERROR_HAVE_NO_MEMORY(info3);
 
-                       init_netlogon_info3(info3,
-                                           flags,
-                                           logon_attempts);
+                       info3->flags                    = flags;
+                       info3->logon_attempts           = logon_attempts;
+
                        r->out.query->info3 = info3;
                        break;
                default:
@@ -285,7 +251,7 @@ WERROR _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
  ******************************************************************/
 
 static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct,
-                         uint16_t sec_chan_type, uint32_t *rid)
+                         uint16_t sec_chan_type, struct dom_sid *sid)
 {
        struct samu *sampass = NULL;
        const uint8 *pass;
@@ -381,9 +347,7 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct,
        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);
 
@@ -399,30 +363,26 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct,
 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 */
-       *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;
 }
@@ -466,10 +426,12 @@ NTSTATUS _netr_ServerAuthenticate3(pipes_struct *p,
        /* 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;
-       struct netr_Credential srv_chal_out;
        const char *fn;
-       uint32_t rid;
+       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
@@ -489,7 +451,8 @@ NTSTATUS _netr_ServerAuthenticate3(pipes_struct *p,
                   NETLOGON_NEG_FULL_SYNC_REPL |
                   NETLOGON_NEG_MULTIPLE_SIDS |
                   NETLOGON_NEG_REDO |
-                  NETLOGON_NEG_PASSWORD_CHANGE_REFUSAL;
+                  NETLOGON_NEG_PASSWORD_CHANGE_REFUSAL |
+                  NETLOGON_NEG_PASSWORD_SET2;
 
        /* Ensure we support strong (128-bit) keys. */
        if (in_neg_flags & NETLOGON_NEG_STRONG_KEYS) {
@@ -517,7 +480,7 @@ NTSTATUS _netr_ServerAuthenticate3(pipes_struct *p,
        /* 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));
                status = NT_STATUS_ACCESS_DENIED;
@@ -538,7 +501,7 @@ NTSTATUS _netr_ServerAuthenticate3(pipes_struct *p,
        status = get_md4pw(&mach_pwd,
                           r->in.account_name,
                           r->in.secure_channel_type,
-                          &rid);
+                          &sid);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("%s: failed to get machine password for "
                        "account %s: %s\n",
@@ -549,15 +512,18 @@ NTSTATUS _netr_ServerAuthenticate3(pipes_struct *p,
        }
 
        /* From the client / server challenges and md4 password, generate sess key */
-       creds_server_init(in_neg_flags,
-                       p->dc,
-                       &p->dc->clnt_chal,      /* Stored client chal. */
-                       &p->dc->srv_chal,       /* Stored server chal. */
-                       mach_pwd.hash,
-                       &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,
@@ -565,24 +531,23 @@ NTSTATUS _netr_ServerAuthenticate3(pipes_struct *p,
                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();
 
-       *r->out.rid = rid;
+       if (!NT_STATUS_IS_OK(status)) {
+               goto out;
+       }
+
+       sid_peek_rid(&sid, r->out.rid);
 
        status = NT_STATUS_OK;
 
@@ -617,67 +582,57 @@ NTSTATUS _netr_ServerAuthenticate2(pipes_struct *p,
 }
 
 /*************************************************************************
- _netr_ServerPasswordSet
  *************************************************************************/
 
-NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
-                                struct netr_ServerPasswordSet *r)
+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 = NT_STATUS_OK;
-       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;
-
-       DEBUG(5,("_netr_ServerPasswordSet: %d\n", __LINE__));
-
-       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",
-                       r->in.computer_name));
+       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;
        }
 
-       if (!p->dc) {
-               /* Restore the saved state of the netlogon creds. */
-               become_root();
-               ret = secrets_restore_schannel_session_info(p, r->in.computer_name,
-                                                           &p->dc);
-               unbecome_root();
-               if (!ret) {
-                       return NT_STATUS_INVALID_HANDLE;
-               }
-       }
+       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);
 
-       if (!p->dc || !p->dc->authenticated) {
-               return NT_STATUS_INVALID_HANDLE;
-       }
+       return status;
+}
 
-       DEBUG(3,("_netr_ServerPasswordSet: Server Password Set by remote machine:[%s] on account [%s]\n",
-                       r->in.computer_name, p->dc->mach_acct));
+/*************************************************************************
+ *************************************************************************/
 
-       /* Step the creds chain forward. */
-       if (!netlogon_creds_server_step(p->dc, r->in.credential, &cred_out)) {
-               DEBUG(2,("_netr_ServerPasswordSet: 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;
-       }
+static NTSTATUS netr_find_machine_account(TALLOC_CTX *mem_ctx,
+                                         const char *account_name,
+                                         struct samu **sampassp)
+{
+       struct samu *sampass;
+       bool ret = false;
+       uint32_t acct_ctrl;
 
-       /* We must store the creds state after an update. */
-       sampass = samu_new( NULL );
+       sampass = samu_new(mem_ctx);
        if (!sampass) {
                return NT_STATUS_NO_MEMORY;
        }
 
        become_root();
-       secrets_store_schannel_session_info(p, r->in.computer_name, p->dc);
-       ret = pdb_getsampwnam(sampass, p->dc->mach_acct);
+       ret = pdb_getsampwnam(sampass, account_name);
        unbecome_root();
 
        if (!ret) {
@@ -690,124 +645,227 @@ NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
        acct_ctrl = pdb_get_acct_ctrl(sampass);
 
        if (!(acct_ctrl & ACB_WSTRUST ||
-                     acct_ctrl & ACB_SVRTRUST ||
-                     acct_ctrl & ACB_DOMTRUST)) {
+             acct_ctrl & ACB_SVRTRUST ||
+             acct_ctrl & ACB_DOMTRUST)) {
                TALLOC_FREE(sampass);
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       if (pdb_get_acct_ctrl(sampass) & ACB_DISABLED) {
+       if (acct_ctrl & ACB_DISABLED) {
                TALLOC_FREE(sampass);
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
-       /* Woah - what does this to to the credential chain ? JRA */
-       cred_hash3(pwd, r->in.new_password->hash, p->dc->sess_key, 0);
+       *sampassp = sampass;
 
-       DEBUG(100,("_netr_ServerPasswordSet: new given value was :\n"));
-       for(i = 0; i < sizeof(pwd); i++)
-               DEBUG(100,("%02X ", pwd[i]));
-       DEBUG(100,("\n"));
-
-       old_pw = pdb_get_nt_passwd(sampass);
+       return NT_STATUS_OK;
+}
 
-       if (old_pw && memcmp(pwd, old_pw, 16) == 0) {
-               /* Avoid backend modificiations and other fun if the
-                  client changed the password to the *same thing* */
+/*************************************************************************
+ *************************************************************************/
 
-               ret = True;
-       } else {
+static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
+                                                 struct samu *sampass,
+                                                 DATA_BLOB *plaintext_blob,
+                                                 struct samr_Password *nt_hash,
+                                                 struct samr_Password *lm_hash)
+{
+       NTSTATUS status;
+       const uchar *old_pw;
+       const char *plaintext = NULL;
+       size_t plaintext_len;
+       struct samr_Password nt_hash_local;
 
-               /* LM password should be NULL for machines */
-               if (!pdb_set_lanman_passwd(sampass, NULL, PDB_CHANGED)) {
-                       TALLOC_FREE(sampass);
-                       return NT_STATUS_NO_MEMORY;
-               }
+       if (!sampass) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-               if (!pdb_set_nt_passwd(sampass, pwd, PDB_CHANGED)) {
-                       TALLOC_FREE(sampass);
-                       return NT_STATUS_NO_MEMORY;
+       if (plaintext_blob) {
+               if (!convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX,
+                                          plaintext_blob->data, plaintext_blob->length,
+                                          &plaintext, &plaintext_len, false))
+               {
+                       plaintext = NULL;
+                       mdfour(nt_hash_local.hash, plaintext_blob->data, plaintext_blob->length);
+                       nt_hash = &nt_hash_local;
                }
+       }
 
-               if (!pdb_set_pass_last_set_time(sampass, time(NULL), PDB_CHANGED)) {
-                       TALLOC_FREE(sampass);
-                       /* Not quite sure what this one qualifies as, but this will do */
-                       return NT_STATUS_UNSUCCESSFUL;
+       if (plaintext) {
+               if (!pdb_set_plaintext_passwd(sampass, plaintext)) {
+                       return NT_STATUS_ACCESS_DENIED;
                }
 
-               become_root();
-               status = pdb_update_sam_account(sampass);
-               unbecome_root();
+               goto done;
        }
 
-       /* set up the LSA Server Password Set response */
+       if (nt_hash) {
+               old_pw = pdb_get_nt_passwd(sampass);
+
+               if (old_pw && memcmp(nt_hash->hash, old_pw, 16) == 0) {
+                       /* Avoid backend modificiations and other fun if the
+                          client changed the password to the *same thing* */
+               } else {
+                       /* LM password should be NULL for machines */
+                       if (!pdb_set_lanman_passwd(sampass, NULL, PDB_CHANGED)) {
+                               return NT_STATUS_NO_MEMORY;
+                       }
+                       if (!pdb_set_nt_passwd(sampass, nt_hash->hash, PDB_CHANGED)) {
+                               return NT_STATUS_NO_MEMORY;
+                       }
 
-       memcpy(r->out.return_authenticator, &cred_out,
-              sizeof(*(r->out.return_authenticator)));
+                       if (!pdb_set_pass_last_set_time(sampass, time(NULL), PDB_CHANGED)) {
+                               /* Not quite sure what this one qualifies as, but this will do */
+                               return NT_STATUS_UNSUCCESSFUL;
+                       }
+               }
+       }
+
+ done:
+       become_root();
+       status = pdb_update_sam_account(sampass);
+       unbecome_root();
 
-       TALLOC_FREE(sampass);
        return status;
 }
 
 /*************************************************************************
- _netr_LogonSamLogoff
+ _netr_ServerPasswordSet
  *************************************************************************/
 
-NTSTATUS _netr_LogonSamLogoff(pipes_struct *p,
-                             struct netr_LogonSamLogoff *r)
+NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
+                                struct netr_ServerPasswordSet *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;
+       NTSTATUS status = NT_STATUS_OK;
+       struct samu *sampass=NULL;
+       int i;
+       struct netlogon_creds_CredentialState *creds;
+
+       DEBUG(5,("_netr_ServerPasswordSet: %d\n", __LINE__));
+
+       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();
+
+       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",
+                       r->in.computer_name, creds->computer_name));
+               TALLOC_FREE(creds);
+               return status;
        }
 
+       DEBUG(3,("_netr_ServerPasswordSet: Server Password Set by remote machine:[%s] on account [%s]\n",
+                       r->in.computer_name, creds->computer_name));
 
-       /* Using the remote machine name for the creds store: */
-       /* r->in.computer_name */
+       netlogon_creds_des_decrypt(creds, r->in.new_password);
 
-       if (!p->dc) {
-               /* Restore the saved state of the netlogon creds. */
-               bool ret;
+       DEBUG(100,("_netr_ServerPasswordSet: new given value was :\n"));
+       for(i = 0; i < sizeof(r->in.new_password->hash); i++)
+               DEBUG(100,("%02X ", r->in.new_password->hash[i]));
+       DEBUG(100,("\n"));
 
-               become_root();
-               ret = secrets_restore_schannel_session_info(
-                       p, r->in.computer_name, &p->dc);
-               unbecome_root();
-               if (!ret) {
-                       return NT_STATUS_INVALID_HANDLE;
-               }
+       status = netr_find_machine_account(p->mem_ctx,
+                                          creds->account_name,
+                                          &sampass);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       if (!p->dc || !p->dc->authenticated) {
-               return NT_STATUS_INVALID_HANDLE;
+       status = netr_set_machine_account_password(sampass,
+                                                  sampass,
+                                                  NULL,
+                                                  r->in.new_password,
+                                                  NULL);
+       TALLOC_FREE(sampass);
+       return status;
+}
+
+/****************************************************************
+ _netr_ServerPasswordSet2
+****************************************************************/
+
+NTSTATUS _netr_ServerPasswordSet2(pipes_struct *p,
+                                 struct netr_ServerPasswordSet2 *r)
+{
+       NTSTATUS status;
+       struct netlogon_creds_CredentialState *creds;
+       struct samu *sampass;
+       DATA_BLOB plaintext;
+       struct samr_CryptPassword password_buf;
+
+       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();
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(2,("_netr_ServerPasswordSet2: netlogon_creds_server_step "
+                       "failed. Rejecting auth request from client %s machine account %s\n",
+                       r->in.computer_name, creds->computer_name));
+               TALLOC_FREE(creds);
+               return status;
        }
 
-       /* 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;
+       memcpy(password_buf.data, r->in.new_password->data, 512);
+       SIVAL(password_buf.data, 512, r->in.new_password->length);
+       netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
+
+       if (!extract_pw_from_buffer(p->mem_ctx, password_buf.data, &plaintext)) {
+               return NT_STATUS_WRONG_PASSWORD;
+       }
+
+       status = netr_find_machine_account(p->mem_ctx,
+                                          creds->account_name,
+                                          &sampass);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       /* We must store the creds state after an update. */
+       status = netr_set_machine_account_password(sampass,
+                                                  sampass,
+                                                  &plaintext,
+                                                  NULL,
+                                                  NULL);
+       TALLOC_FREE(sampass);
+       return status;
+}
+
+/*************************************************************************
+ _netr_LogonSamLogoff
+ *************************************************************************/
+
+NTSTATUS _netr_LogonSamLogoff(pipes_struct *p,
+                             struct netr_LogonSamLogoff *r)
+{
+       NTSTATUS status;
+       struct netlogon_creds_CredentialState *creds;
+
        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;
        union netr_LogonLevel *logon = r->in.logon;
@@ -824,19 +882,16 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
                        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:
-                       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;
+                       return NT_STATUS_INTERNAL_ERROR;
        }
 
        *r->out.authoritative = true; /* authoritative response */
@@ -860,44 +915,6 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
                return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       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;
-               }
-
-               /* 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;
-               }
-
-               /* 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();
-       }
-
        switch (r->in.logon_level) {
        case NetlogonInteractiveInformation:
                nt_username     = logon->password->identity_info.account_name.string;
@@ -978,7 +995,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
                                                         chal,
                                                         logon->password->lmpassword.hash,
                                                         logon->password->ntpassword.hash,
-                                                        p->dc->sess_key)) {
+                                                        creds->session_key)) {
                        status = NT_STATUS_NO_MEMORY;
                }
                break;
@@ -1029,7 +1046,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
 
        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)
@@ -1055,6 +1072,75 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
        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;
+}
+
 /*************************************************************************
  _netr_LogonSamLogonEx
  - no credential chaining. Map into net sam logon.
@@ -1063,7 +1149,15 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
 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) {
@@ -1072,20 +1166,10 @@ NTSTATUS _netr_LogonSamLogonEx(pipes_struct *p,
                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;
 }
 
 /*************************************************************************
@@ -1300,16 +1384,6 @@ NTSTATUS _netr_LogonGetDomainInfo(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _netr_ServerPasswordSet2(pipes_struct *p,
-                                 struct netr_ServerPasswordSet2 *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 WERROR _netr_ServerPasswordGet(pipes_struct *p,
                               struct netr_ServerPasswordGet *r)
 {
@@ -1440,16 +1514,6 @@ WERROR _netr_GetForestTrustInformation(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-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)
 {