s3-netlogon: fix default case when _netr_LogonSamLogon is called from other opcodes.
[ira/wip.git] / source3 / rpc_server / srv_netlog_nt.c
index 5b26f558459b1ddca94fafc0e0c77e722d97e7d9..01b2398e8637944c3c27248d51b70bc66ca0d99a 100644 (file)
 /* This is the implementation of the netlogon pipe. */
 
 #include "includes.h"
+#include "../libcli/auth/libcli_auth.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));
-}
-
 /*******************************************************************
  Inits a netr_NETLOGON_INFO_1 structure.
 ********************************************************************/
@@ -90,28 +79,24 @@ static void init_netlogon_info3(struct netr_NETLOGON_INFO_3 *r,
 WERROR _netr_LogonControl(pipes_struct *p,
                          struct netr_LogonControl *r)
 {
-       struct netr_NETLOGON_INFO_1 *info1;
-       uint32_t flags = 0x0;
-       uint32_t pdc_connection_status = W_ERROR_V(WERR_OK);
-
-       /* Setup the Logon Control response */
+       struct netr_LogonControl2Ex l;
 
        switch (r->in.level) {
-               case 1:
-                       info1 = TALLOC_ZERO_P(p->mem_ctx, struct netr_NETLOGON_INFO_1);
-                       if (!info1) {
-                               return WERR_NOMEM;
-                       }
-                       init_netlogon_info1(info1,
-                                           flags,
-                                           pdc_connection_status);
-                       r->out.info->info1 = info1;
-                       break;
-               default:
-                       return WERR_UNKNOWN_LEVEL;
+       case 1:
+               break;
+       case 2:
+               return WERR_NOT_SUPPORTED;
+       default:
+               return WERR_UNKNOWN_LEVEL;
        }
 
-       return WERR_OK;
+       l.in.logon_server       = r->in.logon_server;
+       l.in.function_code      = r->in.function_code;
+       l.in.level              = r->in.level;
+       l.in.data               = NULL;
+       l.out.query             = r->out.query;
+
+       return _netr_LogonControl2Ex(p, &l);
 }
 
 /****************************************************************************
@@ -131,20 +116,53 @@ static void send_sync_message(void)
 
 WERROR _netr_LogonControl2(pipes_struct *p,
                           struct netr_LogonControl2 *r)
+{
+       struct netr_LogonControl2Ex l;
+
+       l.in.logon_server       = r->in.logon_server;
+       l.in.function_code      = r->in.function_code;
+       l.in.level              = r->in.level;
+       l.in.data               = r->in.data;
+       l.out.query             = r->out.query;
+
+       return _netr_LogonControl2Ex(p, &l);
+}
+
+/****************************************************************
+ _netr_LogonControl2Ex
+****************************************************************/
+
+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;
-       fstring dc_name, dc_name2;
+       fstring dc_name2;
+       const char *dc_name = NULL;
        struct sockaddr_storage dc_ss;
        const char *domain = NULL;
        struct netr_NETLOGON_INFO_1 *info1;
        struct netr_NETLOGON_INFO_2 *info2;
        struct netr_NETLOGON_INFO_3 *info3;
+       const char *fn;
+
+       switch (p->hdr_req.opnum) {
+               case NDR_NETR_LOGONCONTROL:
+                       fn = "_netr_LogonControl";
+                       break;
+               case NDR_NETR_LOGONCONTROL2:
+                       fn = "_netr_LogonControl2";
+                       break;
+               case NDR_NETR_LOGONCONTROL2EX:
+                       fn = "_netr_LogonControl2Ex";
+                       break;
+               default:
+                       return WERR_INVALID_PARAM;
+       }
 
        tc_status = W_ERROR_V(WERR_NO_SUCH_DOMAIN);
-       fstrcpy( dc_name, "" );
 
        switch (r->in.function_code) {
                case NETLOGON_CONTROL_TC_QUERY:
@@ -158,7 +176,10 @@ WERROR _netr_LogonControl2(pipes_struct *p,
                                break;
                        }
 
-                       fstr_sprintf( dc_name, "\\\\%s", dc_name2 );
+                       dc_name = talloc_asprintf(p->mem_ctx, "\\\\%s", dc_name2);
+                       if (!dc_name) {
+                               return WERR_NOMEM;
+                       }
 
                        tc_status = W_ERROR_V(WERR_OK);
 
@@ -175,7 +196,10 @@ WERROR _netr_LogonControl2(pipes_struct *p,
                                break;
                        }
 
-                       fstr_sprintf( dc_name, "\\\\%s", dc_name2 );
+                       dc_name = talloc_asprintf(p->mem_ctx, "\\\\%s", dc_name2);
+                       if (!dc_name) {
+                               return WERR_NOMEM;
+                       }
 
                        tc_status = W_ERROR_V(WERR_OK);
 
@@ -183,8 +207,8 @@ WERROR _netr_LogonControl2(pipes_struct *p,
 
                default:
                        /* no idea what this should be */
-                       DEBUG(0,("_netr_LogonControl2: unimplemented function level [%d]\n",
-                               r->in.function_code));
+                       DEBUG(0,("%s: unimplemented function level [%d]\n",
+                               fn, r->in.function_code));
                        return WERR_UNKNOWN_LEVEL;
        }
 
@@ -260,7 +284,8 @@ WERROR _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
  gets a machine password entry.  checks access rights of the host.
  ******************************************************************/
 
-static NTSTATUS get_md4pw(char *md4pw, const char *mach_acct, uint16 sec_chan_type)
+static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct,
+                         uint16_t sec_chan_type, uint32_t *rid)
 {
        struct samu *sampass = NULL;
        const uint8 *pass;
@@ -353,8 +378,12 @@ static NTSTATUS get_md4pw(char *md4pw, const char *mach_acct, uint16 sec_chan_ty
                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);
+       }
 
        TALLOC_FREE(sampass);
 
@@ -371,7 +400,7 @@ NTSTATUS _netr_ServerReqChallenge(pipes_struct *p,
                                  struct netr_ServerReqChallenge *r)
 {
        if (!p->dc) {
-               p->dc = TALLOC_ZERO_P(p->pipe_state_mem_ctx, struct dcinfo);
+               p->dc = TALLOC_ZERO_P(p, struct dcinfo);
                if (!p->dc) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -391,7 +420,7 @@ NTSTATUS _netr_ServerReqChallenge(pipes_struct *p,
        generate_random_buffer(p->dc->srv_chal.data, 8);
 
        /* set up the LSA REQUEST CHALLENGE response */
-       init_net_r_req_chal(r->out.return_credentials, &p->dc->srv_chal);
+       *r->out.return_credentials = p->dc->srv_chal;
 
        p->dc->challenge_sent = True;
 
@@ -406,125 +435,139 @@ NTSTATUS _netr_ServerReqChallenge(pipes_struct *p,
 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);
-       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;
-       }
+       struct netr_ServerAuthenticate3 a;
+       uint32_t negotiate_flags = 0;
+       uint32_t rid;
 
-       /* 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);
+       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;
 
-       /* 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;
-       }
-
-       fstrcpy(p->dc->mach_acct, r->in.account_name);
-       fstrcpy(p->dc->remote_machine, r->in.computer_name);
-       p->dc->authenticated = True;
+       a.out.return_credentials        = r->out.return_credentials;
+       a.out.rid                       = &rid;
+       a.out.negotiate_flags           = &negotiate_flags;
 
-       /* set up the LSA AUTH response */
-       /* Return the server credentials. */
+       return _netr_ServerAuthenticate3(p, &a);
 
-       memcpy(r->out.return_credentials->data, &srv_chal_out.data,
-              sizeof(r->out.return_credentials->data));
-
-       return NT_STATUS_OK;
 }
 
 /*************************************************************************
- _netr_ServerAuthenticate2
+ _netr_ServerAuthenticate3
  *************************************************************************/
 
-NTSTATUS _netr_ServerAuthenticate2(pipes_struct *p,
-                                  struct netr_ServerAuthenticate2 *r)
+NTSTATUS _netr_ServerAuthenticate3(pipes_struct *p,
+                                  struct netr_ServerAuthenticate3 *r)
 {
        NTSTATUS status;
        uint32_t srv_flgs;
+       /* 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 samr_Password mach_pwd;
+
+       /* 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
+        * 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.
+        */
+
+       /* 0x000001ff */
+       srv_flgs = NETLOGON_NEG_ACCOUNT_LOCKOUT |
+                  NETLOGON_NEG_PERSISTENT_SAMREPL |
+                  NETLOGON_NEG_ARCFOUR |
+                  NETLOGON_NEG_PROMOTION_COUNT |
+                  NETLOGON_NEG_CHANGELOG_BDC |
+                  NETLOGON_NEG_FULL_SYNC_REPL |
+                  NETLOGON_NEG_MULTIPLE_SIDS |
+                  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;
+       }
+
+       switch (p->hdr_req.opnum) {
+               case NDR_NETR_SERVERAUTHENTICATE:
+                       fn = "_netr_ServerAuthenticate";
+                       break;
+               case NDR_NETR_SERVERAUTHENTICATE2:
+                       fn = "_netr_ServerAuthenticate2";
+                       break;
+               case NDR_NETR_SERVERAUTHENTICATE3:
+                       fn = "_netr_ServerAuthenticate3";
+                       break;
+               default:
+                       return NT_STATUS_INTERNAL_ERROR;
+       }
 
        /* We use this as the key to store the creds: */
        /* r->in.computer_name */
 
        if (!p->dc || !p->dc->challenge_sent) {
-               DEBUG(0,("_netr_ServerAuthenticate2: no challenge sent to client %s\n",
+               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,("_netr_ServerAuthenticate2: schannel required but client failed "
+               DEBUG(0,("%s: schannel required but client failed "
                        "to offer it. Client was %s\n",
-                       r->in.account_name));
-               return NT_STATUS_ACCESS_DENIED;
+                       fn, r->in.account_name));
+               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->in.secure_channel_type,
+                          &rid);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("_netr_ServerAuthenticate2: failed to get machine password for "
+               DEBUG(0,("%s: failed to get machine password for "
                        "account %s: %s\n",
-                       r->in.account_name, nt_errstr(status) ));
+                       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,
+       creds_server_init(in_neg_flags,
                        p->dc,
                        &p->dc->clnt_chal,      /* Stored client chal. */
                        &p->dc->srv_chal,       /* Stored server chal. */
-                       p->dc->mach_pw,
+                       mach_pwd.hash,
                        &srv_chal_out);
 
        /* Check client credentials are valid. */
        if (!netlogon_creds_server_check(p->dc, r->in.credentials)) {
-               DEBUG(0,("_netr_ServerAuthenticate2: netlogon_creds_server_check failed. Rejecting auth "
+               DEBUG(0,("%s: netlogon_creds_server_check failed. Rejecting auth "
                        "request from client %s machine account %s\n",
-                       r->in.computer_name,
+                       fn, r->in.computer_name,
                        r->in.account_name));
-               return NT_STATUS_ACCESS_DENIED;
+               status = NT_STATUS_ACCESS_DENIED;
+               goto out;
        }
-
-       srv_flgs = 0x000001ff;
-
-       if (lp_server_schannel() != false) {
-               srv_flgs |= NETLOGON_NEG_SCHANNEL;
-       }
-
        /* set up the LSA AUTH 2 response */
        memcpy(r->out.return_credentials->data, &srv_chal_out.data,
               sizeof(r->out.return_credentials->data));
-       *r->out.negotiate_flags = srv_flgs;
 
        fstrcpy(p->dc->mach_acct, r->in.account_name);
        fstrcpy(p->dc->remote_machine, r->in.computer_name);
@@ -539,7 +582,38 @@ NTSTATUS _netr_ServerAuthenticate2(pipes_struct *p,
                                            p->dc);
        unbecome_root();
 
-       return NT_STATUS_OK;
+       *r->out.rid = rid;
+
+       status = NT_STATUS_OK;
+
+  out:
+
+       *r->out.negotiate_flags = srv_flgs;
+       return status;
+}
+
+/*************************************************************************
+ _netr_ServerAuthenticate2
+ *************************************************************************/
+
+NTSTATUS _netr_ServerAuthenticate2(pipes_struct *p,
+                                  struct netr_ServerAuthenticate2 *r)
+{
+       struct netr_ServerAuthenticate3 a;
+       uint32_t rid;
+
+       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            = r->in.negotiate_flags;
+
+       a.out.return_credentials        = r->out.return_credentials;
+       a.out.rid                       = &rid;
+       a.out.negotiate_flags           = r->out.negotiate_flags;
+
+       return _netr_ServerAuthenticate3(p, &a);
 }
 
 /*************************************************************************
@@ -550,7 +624,6 @@ NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
                                 struct netr_ServerPasswordSet *r)
 {
        NTSTATUS status = NT_STATUS_OK;
-       fstring remote_machine;
        struct samu *sampass=NULL;
        bool ret = False;
        unsigned char pwd[16];
@@ -561,24 +634,20 @@ NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
 
        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 ));
+                       r->in.computer_name));
                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->pipe_state_mem_ctx,
-                                                       remote_machine,
-                                                       &p->dc);
+               ret = secrets_restore_schannel_session_info(p, r->in.computer_name,
+                                                           &p->dc);
                unbecome_root();
                if (!ret) {
                        return NT_STATUS_INVALID_HANDLE;
@@ -590,13 +659,13 @@ NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
        }
 
        DEBUG(3,("_netr_ServerPasswordSet: Server Password Set by remote machine:[%s] on account [%s]\n",
-                       remote_machine, p->dc->mach_acct));
+                       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",
-                       remote_machine, p->dc->mach_acct ));
+                       r->in.computer_name, p->dc->mach_acct ));
                return NT_STATUS_INVALID_PARAMETER;
        }
 
@@ -607,9 +676,7 @@ NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
        }
 
        become_root();
-       secrets_store_schannel_session_info(p->pipe_state_mem_ctx,
-                                               remote_machine,
-                                               p->dc);
+       secrets_store_schannel_session_info(p, r->in.computer_name, p->dc);
        ret = pdb_getsampwnam(sampass, p->dc->mach_acct);
        unbecome_root();
 
@@ -676,7 +743,7 @@ NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
        /* set up the LSA Server Password Set response */
 
        memcpy(r->out.return_authenticator, &cred_out,
-              sizeof(r->out.return_authenticator));
+              sizeof(*(r->out.return_authenticator)));
 
        TALLOC_FREE(sampass);
        return status;
@@ -699,9 +766,6 @@ NTSTATUS _netr_LogonSamLogoff(pipes_struct *p,
        }
 
 
-       if (!get_valid_user_struct(p->vuid))
-               return NT_STATUS_NO_SUCH_USER;
-
        /* Using the remote machine name for the creds store: */
        /* r->in.computer_name */
 
@@ -710,9 +774,8 @@ NTSTATUS _netr_LogonSamLogoff(pipes_struct *p,
                bool ret;
 
                become_root();
-               ret = secrets_restore_schannel_session_info(p->pipe_state_mem_ctx,
-                                                           r->in.computer_name,
-                                                           &p->dc);
+               ret = secrets_restore_schannel_session_info(
+                       p, r->in.computer_name, &p->dc);
                unbecome_root();
                if (!ret) {
                        return NT_STATUS_INVALID_HANDLE;
@@ -733,44 +796,12 @@ NTSTATUS _netr_LogonSamLogoff(pipes_struct *p,
 
        /* We must store the creds state after an update. */
        become_root();
-       secrets_store_schannel_session_info(p->pipe_state_mem_ctx,
-                                           r->in.computer_name,
-                                           p->dc);
+       secrets_store_schannel_session_info(p, r->in.computer_name, p->dc);
        unbecome_root();
 
        return NT_STATUS_OK;
 }
 
-/*******************************************************************
- gets a domain user's groups from their already-calculated NT_USER_TOKEN
- ********************************************************************/
-
-static NTSTATUS nt_token_to_group_list(TALLOC_CTX *mem_ctx,
-                                      const DOM_SID *domain_sid,
-                                      size_t num_sids,
-                                      const DOM_SID *sids,
-                                      int *numgroups, DOM_GID **pgids)
-{
-       int i;
-
-       *numgroups=0;
-       *pgids = NULL;
-
-       for (i=0; i<num_sids; i++) {
-               DOM_GID gid;
-               if (!sid_peek_check_rid(domain_sid, &sids[i], &gid.g_rid)) {
-                       continue;
-               }
-               gid.attr = (SE_GROUP_MANDATORY|SE_GROUP_ENABLED_BY_DEFAULT|
-                           SE_GROUP_ENABLED);
-               ADD_TO_ARRAY(mem_ctx, DOM_GID, gid, pgids, numgroups);
-               if (*pgids == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-       }
-       return NT_STATUS_OK;
-}
-
 /*************************************************************************
  _netr_LogonSamLogon
  *************************************************************************/
@@ -779,68 +810,72 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
                             struct netr_LogonSamLogon *r)
 {
        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 samu *sampw;
        struct auth_context *auth_context = NULL;
+       uint8_t pipe_session_key[16];
        bool process_creds = true;
+       const char *fn;
 
        switch (p->hdr_req.opnum) {
                case NDR_NETR_LOGONSAMLOGON:
                        process_creds = true;
+                       fn = "_netr_LogonSamLogon";
                        break;
                case NDR_NETR_LOGONSAMLOGONEX:
-               default:
                        process_creds = false;
+                       fn = "_netr_LogonSamLogonEx";
+                       break;
+               default:
+                       return NT_STATUS_INTERNAL_ERROR;
        }
 
        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_LogonSamLogon: client %s not using schannel for netlogon\n",
-                       get_remote_machine_name() ));
+               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;
-       }
-
-       /* 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,("_netr_LogonSamLogon: bad validation_level value %d.\n",
-                       (int)r->in.validation_level));
-               return NT_STATUS_ACCESS_DENIED;
-       }
 
-       if (!get_valid_user_struct(p->vuid))
-               return NT_STATUS_NO_SUCH_USER;
+       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;
+               }
+               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;
+               }
+               break;
+       default:
+               DEBUG(0,("%s: bad validation_level value %d.\n",
+                       fn, (int)r->in.validation_level));
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
 
        if (process_creds) {
-               fstring remote_machine;
 
                /* 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.
                */
 
-               fstrcpy(remote_machine, 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->pipe_state_mem_ctx,
-                                       remote_machine,
-                                       &p->dc);
+                       ret = secrets_restore_schannel_session_info(
+                               p, r->in.computer_name, &p->dc);
                        unbecome_root();
                        if (!ret) {
                                return NT_STATUS_INVALID_HANDLE;
@@ -853,38 +888,30 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
 
                /* checks and updates credentials.  creates reply credentials */
                if (!netlogon_creds_server_step(p->dc, r->in.credential,  r->out.return_authenticator)) {
-                       DEBUG(2,("_netr_LogonSamLogon: creds_server_step failed. Rejecting auth "
+                       DEBUG(2,("%s: creds_server_step failed. Rejecting auth "
                                "request from client %s machine account %s\n",
-                               remote_machine, p->dc->mach_acct ));
+                               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->pipe_state_mem_ctx,
-                                       remote_machine,
-                                       p->dc);
+               secrets_store_schannel_session_info(p, r->in.computer_name, p->dc);
                unbecome_root();
        }
 
        switch (r->in.logon_level) {
-       case INTERACTIVE_LOGON_TYPE:
-               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);
+       case NetlogonInteractiveInformation:
+               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 NET_LOGON_TYPE:
-               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);
+       case NetlogonNetworkInformation:
+               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;
@@ -903,7 +930,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
        status = NT_STATUS_OK;
 
        switch (r->in.logon_level) {
-       case NET_LOGON_TYPE:
+       case NetlogonNetworkInformation:
        {
                const char *wksname = nt_workstation;
 
@@ -932,19 +959,19 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
                }
                break;
        }
-       case INTERACTIVE_LOGON_TYPE:
+       case NetlogonInteractiveInformation:
                /* 'Interactive' authentication, supplies the password in its
                   MD4 form, encrypted with the session key.  We will convert
                   this to challenge/response for the auth subsystem to chew
                   on */
        {
-               const uint8 *chal;
+               uint8_t chal[8];
 
                if (!NT_STATUS_IS_OK(status = make_auth_context_subsystem(&auth_context))) {
                        return status;
                }
 
-               chal = auth_context->get_ntlm_challenge(auth_context);
+               auth_context->get_ntlm_challenge(auth_context, chal);
 
                if (!make_user_info_netlogon_interactive(&user_info,
                                                         nt_username, nt_domain,
@@ -971,8 +998,8 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
        (auth_context->free)(&auth_context);
        free_user_info(&user_info);
 
-       DEBUG(5,("_netr_LogonSamLogon: check_password returned status %s\n",
-                 nt_errstr(status)));
+       DEBUG(5,("%s: check_password returned status %s\n",
+                 fn, nt_errstr(status)));
 
        /* Check account and password */
 
@@ -992,8 +1019,8 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
 
        if (server_info->guest) {
                /* We don't like guest domain logons... */
-               DEBUG(5,("_netr_LogonSamLogon: Attempted domain logon as GUEST "
-                        "denied.\n"));
+               DEBUG(5,("%s: Attempted domain logon as GUEST "
+                        "denied.\n", fn));
                TALLOC_FREE(server_info);
                return NT_STATUS_LOGON_FAILURE;
        }
@@ -1002,161 +1029,31 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
            the SAM Local Security Authority should record that the user is
            logged in to the domain.  */
 
-       {
-               DOM_GID *gids = NULL;
-               const DOM_SID *user_sid = NULL;
-               const DOM_SID *group_sid = NULL;
-               DOM_SID domain_sid;
-               uint32 user_rid, group_rid;
-
-               int num_gids = 0;
-               const char *my_name;
-
-               struct netr_UserSessionKey user_session_key;
-               struct netr_LMSessionKey lm_session_key;
-               unsigned char pipe_session_key[16];
-
-               NTTIME last_logon, last_logoff, acct_expiry, last_password_change;
-               NTTIME allow_password_change, force_password_change;
-               struct samr_RidWithAttributeArray groups;
-               int i;
-               struct dom_sid2 *sid = NULL;
-
-               ZERO_STRUCT(user_session_key);
-               ZERO_STRUCT(lm_session_key);
-
-               sampw = server_info->sam_account;
-
-               user_sid = pdb_get_user_sid(sampw);
-               group_sid = pdb_get_group_sid(sampw);
-
-               if ((user_sid == NULL) || (group_sid == NULL)) {
-                       DEBUG(1, ("_netr_LogonSamLogon: User without group or user SID\n"));
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
-
-               sid_copy(&domain_sid, user_sid);
-               sid_split_rid(&domain_sid, &user_rid);
-
-               sid = sid_dup_talloc(p->mem_ctx, &domain_sid);
-               if (!sid) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-
-               if (!sid_peek_check_rid(&domain_sid, group_sid, &group_rid)) {
-                       DEBUG(1, ("_netr_LogonSamLogon: user %s\\%s has user sid "
-                                 "%s\n but group sid %s.\n"
-                                 "The conflicting domain portions are not "
-                                 "supported for NETLOGON calls\n",
-                                 pdb_get_domain(sampw),
-                                 pdb_get_username(sampw),
-                                 sid_string_dbg(user_sid),
-                                 sid_string_dbg(group_sid)));
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
-
-               if(server_info->login_server) {
-                       my_name = server_info->login_server;
-               } else {
-                       my_name = global_myname();
-               }
-
-               status = nt_token_to_group_list(p->mem_ctx, &domain_sid,
-                                               server_info->num_sids,
-                                               server_info->sids,
-                                               &num_gids, &gids);
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
-
-               if (server_info->user_session_key.length) {
-                       memcpy(user_session_key.key,
-                              server_info->user_session_key.data,
-                              MIN(sizeof(user_session_key.key),
-                                  server_info->user_session_key.length));
-                       if (process_creds) {
-                               /* Get the pipe session key from the creds. */
-                               memcpy(pipe_session_key, p->dc->sess_key, 16);
-                       } else {
-                               /* Get the pipe session key from the schannel. */
-                               if (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL || p->auth.a_u.schannel_auth == NULL) {
-                                       return NT_STATUS_INVALID_HANDLE;
-                               }
-                               memcpy(pipe_session_key, p->auth.a_u.schannel_auth->sess_key, 16);
-                       }
-                       SamOEMhash(user_session_key.key, pipe_session_key, 16);
-                       memset(pipe_session_key, '\0', 16);
-               }
-               if (server_info->lm_session_key.length) {
-                       memcpy(lm_session_key.key,
-                              server_info->lm_session_key.data,
-                              MIN(sizeof(lm_session_key.key),
-                                  server_info->lm_session_key.length));
-                       if (process_creds) {
-                               /* Get the pipe session key from the creds. */
-                               memcpy(pipe_session_key, p->dc->sess_key, 16);
-                       } else {
-                               /* Get the pipe session key from the schannel. */
-                               if (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL || p->auth.a_u.schannel_auth == NULL) {
-                                       return NT_STATUS_INVALID_HANDLE;
-                               }
-                               memcpy(pipe_session_key, p->auth.a_u.schannel_auth->sess_key, 16);
-                       }
-                       SamOEMhash(lm_session_key.key, pipe_session_key, 16);
-                       memset(pipe_session_key, '\0', 16);
-               }
-
-               groups.count = num_gids;
-               groups.rids = TALLOC_ARRAY(p->mem_ctx, struct samr_RidWithAttribute,
-                                          groups.count);
-               if (!groups.rids) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-
-               for (i=0; i < groups.count; i++) {
-                       groups.rids[i].rid = gids[i].g_rid;
-                       groups.rids[i].attributes = gids[i].attr;
+       if (process_creds) {
+               /* Get the pipe session key from the creds. */
+               memcpy(pipe_session_key, p->dc->sess_key, 16);
+       } else {
+               /* Get the pipe session key from the schannel. */
+               if ((p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL)
+                   || (p->auth.a_u.schannel_auth == NULL)) {
+                       return NT_STATUS_INVALID_HANDLE;
                }
+               memcpy(pipe_session_key, p->auth.a_u.schannel_auth->sess_key, 16);
+       }
 
-               unix_to_nt_time(&last_logon, pdb_get_logon_time(sampw));
-               unix_to_nt_time(&last_logoff, get_time_t_max());
-               unix_to_nt_time(&acct_expiry, get_time_t_max());
-               unix_to_nt_time(&last_password_change, pdb_get_pass_last_set_time(sampw));
-               unix_to_nt_time(&allow_password_change, pdb_get_pass_can_change_time(sampw));
-               unix_to_nt_time(&force_password_change, pdb_get_pass_must_change_time(sampw));
-
-               init_netr_SamInfo3(sam3,
-                                  last_logon,
-                                  last_logoff,
-                                  acct_expiry,
-                                  last_password_change,
-                                  allow_password_change,
-                                  force_password_change,
-                                  talloc_strdup(p->mem_ctx, pdb_get_username(sampw)),
-                                  talloc_strdup(p->mem_ctx, pdb_get_fullname(sampw)),
-                                  talloc_strdup(p->mem_ctx, pdb_get_logon_script(sampw)),
-                                  talloc_strdup(p->mem_ctx, pdb_get_profile_path(sampw)),
-                                  talloc_strdup(p->mem_ctx, pdb_get_homedir(sampw)),
-                                  talloc_strdup(p->mem_ctx, pdb_get_dir_drive(sampw)),
-                                  0, /* logon_count */
-                                  0, /* bad_password_count */
-                                  user_rid,
-                                  group_rid,
-                                  groups,
-                                  NETLOGON_EXTRA_SIDS,
-                                  user_session_key,
-                                  my_name,
-                                  talloc_strdup(p->mem_ctx, pdb_get_domain(sampw)),
-                                  sid,
-                                  lm_session_key,
-                                  pdb_get_acct_ctrl(sampw),
-                                  0, /* sidcount */
-                                  NULL); /* struct netr_SidAttr *sids */
-               ZERO_STRUCT(user_session_key);
-               ZERO_STRUCT(lm_session_key);
+       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;
 }
 
@@ -1172,7 +1069,7 @@ NTSTATUS _netr_LogonSamLogonEx(pipes_struct *p,
 
        /* Only allow this if the pipe is protected. */
        if (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) {
-               DEBUG(0,("_net_sam_logon_ex: client %s not using schannel for netlogon\n",
+               DEBUG(0,("_netr_LogonSamLogonEx: client %s not using schannel for netlogon\n",
                        get_remote_machine_name() ));
                return NT_STATUS_INVALID_PARAMETER;
         }
@@ -1316,16 +1213,6 @@ NTSTATUS _netr_DatabaseRedo(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-WERROR _netr_LogonControl2Ex(pipes_struct *p,
-                            struct netr_LogonControl2Ex *r)
-{
-       p->rng_fault_state = true;
-       return WERR_NOT_SUPPORTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 WERROR _netr_DsRGetDCName(pipes_struct *p,
                          struct netr_DsRGetDCName *r)
 {
@@ -1336,11 +1223,10 @@ WERROR _netr_DsRGetDCName(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-WERROR _netr_NETRLOGONDUMMYROUTINE1(pipes_struct *p,
-                                   struct netr_NETRLOGONDUMMYROUTINE1 *r)
+NTSTATUS _netr_LogonGetCapabilities(pipes_struct *p,
+                                   struct netr_LogonGetCapabilities *r)
 {
-       p->rng_fault_state = true;
-       return WERR_NOT_SUPPORTED;
+       return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 /****************************************************************
@@ -1386,16 +1272,6 @@ WERROR _netr_NETRLOGONCOMPUTECLIENTDIGEST(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _netr_ServerAuthenticate3(pipes_struct *p,
-                                  struct netr_ServerAuthenticate3 *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 WERROR _netr_DsRGetDCNameEx(pipes_struct *p,
                            struct netr_DsRGetDCNameEx *r)
 {
@@ -1576,10 +1452,10 @@ NTSTATUS _netr_LogonSamLogonWithFlags(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-WERROR _netr_NETRSERVERGETTRUSTINFO(pipes_struct *p,
-                                   struct netr_NETRSERVERGETTRUSTINFO *r)
+NTSTATUS _netr_ServerGetTrustInfo(pipes_struct *p,
+                                 struct netr_ServerGetTrustInfo *r)
 {
        p->rng_fault_state = true;
-       return WERR_NOT_SUPPORTED;
+       return NT_STATUS_NOT_IMPLEMENTED;
 }