s3: fix samlogon client and server calls.
[samba.git] / source3 / rpc_server / srv_netlog_nt.c
index 2dd8b821d81f4d63efac181b0d740e2c03e0fc76..2dc6cd639383fee09eb0003a592743e8e870f39d 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-1997,
@@ -6,20 +6,20 @@
  *  Copyright (C) Paul Ashton                       1997.
  *  Copyright (C) Jeremy Allison               1998-2001.
  *  Copyright (C) Andrew Bartlett                   2001.
+ *  Copyright (C) Guenther Deschner                2008.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This is the implementation of the netlogon pipe. */
@@ -35,38 +35,83 @@ extern userdom_struct current_user_info;
  init_net_r_req_chal:
  *************************************************************************/
 
-static void init_net_r_req_chal(NET_R_REQ_CHAL *r_c,
-                                DOM_CHAL *srv_chal, NTSTATUS status)
+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_c->srv_chal.data, srv_chal->data, sizeof(srv_chal->data));
-       r_c->status = status;
+
+       memcpy(r->data, srv_chal->data, sizeof(r->data));
 }
 
-/*************************************************************************
- error messages cropping up when using nltest.exe...
- *************************************************************************/
+/*******************************************************************
+ 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;
+}
 
-#define ERROR_NO_SUCH_DOMAIN   0x54b
-#define ERROR_NO_LOGON_SERVERS 0x51f
-#define NO_ERROR               0x0
+/*******************************************************************
+ 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;
+}
 
 /*************************************************************************
- net_reply_logon_ctrl:
+ _netr_LogonControl
  *************************************************************************/
 
-NTSTATUS _net_logon_ctrl(pipes_struct *p, NET_Q_LOGON_CTRL *q_u, 
-                      NET_R_LOGON_CTRL *r_u)
+WERROR _netr_LogonControl(pipes_struct *p,
+                         struct netr_LogonControl *r)
 {
-       uint32 flags = 0x0;
-       uint32 pdc_connection_status = 0x00; /* Maybe a win32 error code? */
-       
+       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 */
 
-       init_net_r_logon_ctrl(r_u, q_u->query_level, flags, 
-                             pdc_connection_status);
+       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;
+       }
 
-       return r_u->status;
+       return WERR_OK;
 }
 
 /****************************************************************************
@@ -75,146 +120,165 @@ Send a message to smbd to do a sam synchronisation
 
 static void send_sync_message(void)
 {
-        TDB_CONTEXT *tdb;
-
-        tdb = tdb_open_log(lock_path("connections.tdb"), 0,
-                           TDB_DEFAULT, O_RDONLY, 0);
-
-        if (!tdb) {
-                DEBUG(3, ("send_sync_message(): failed to open connections "
-                          "database\n"));
-                return;
-        }
-
         DEBUG(3, ("sending sam synchronisation message\n"));
-        
-        message_send_all(tdb, MSG_SMB_SAM_SYNC, NULL, 0, False, NULL);
-
-        tdb_close(tdb);
+        message_send_all(smbd_messaging_context(), MSG_SMB_SAM_SYNC, NULL, 0,
+                        NULL);
 }
 
 /*************************************************************************
- net_reply_logon_ctrl2:
+ _netr_LogonControl2
  *************************************************************************/
 
-NTSTATUS _net_logon_ctrl2(pipes_struct *p, NET_Q_LOGON_CTRL2 *q_u, NET_R_LOGON_CTRL2 *r_u)
+WERROR _netr_LogonControl2(pipes_struct *p,
+                          struct netr_LogonControl2 *r)
 {
         uint32 flags = 0x0;
         uint32 pdc_connection_status = 0x0;
         uint32 logon_attempts = 0x0;
         uint32 tc_status;
-       fstring servername, domain, dc_name, dc_name2;
-       struct in_addr dc_ip;
-
-       /* this should be \\global_myname() */
-       unistr2_to_ascii(servername, &q_u->uni_server_name, sizeof(servername));
-
-       r_u->status = NT_STATUS_OK;
-       
-       tc_status = ERROR_NO_SUCH_DOMAIN;
-       fstrcpy( dc_name, "" );
-       
-       switch ( q_u->function_code ) {
+       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;
+
+       tc_status = W_ERROR_V(WERR_NO_SUCH_DOMAIN);
+
+       switch (r->in.function_code) {
                case NETLOGON_CONTROL_TC_QUERY:
-                       unistr2_to_ascii(domain, &q_u->info.info6.domain, sizeof(domain));
-                               
+                       domain = r->in.data->domain;
+
                        if ( !is_trusted_domain( domain ) )
                                break;
-                               
-                       if ( !get_dc_name( domain, NULL, dc_name2, &dc_ip ) ) {
-                               tc_status = ERROR_NO_LOGON_SERVERS;
+
+                       if ( !get_dc_name( domain, NULL, dc_name2, &dc_ss ) ) {
+                               tc_status = W_ERROR_V(WERR_NO_LOGON_SERVERS);
                                break;
                        }
 
-                       fstr_sprintf( dc_name, "\\\\%s", dc_name2 );
-                               
-                       tc_status = NO_ERROR;
-                       
+                       dc_name = talloc_asprintf(p->mem_ctx, "\\\\%s", dc_name2);
+                       if (!dc_name) {
+                               return WERR_NOMEM;
+                       }
+
+                       tc_status = W_ERROR_V(WERR_OK);
+
                        break;
-                       
+
                case NETLOGON_CONTROL_REDISCOVER:
-                       unistr2_to_ascii(domain, &q_u->info.info6.domain, sizeof(domain));
-                               
+                       domain = r->in.data->domain;
+
                        if ( !is_trusted_domain( domain ) )
                                break;
-                               
-                       if ( !get_dc_name( domain, NULL, dc_name2, &dc_ip ) ) {
-                               tc_status = ERROR_NO_LOGON_SERVERS;
+
+                       if ( !get_dc_name( domain, NULL, dc_name2, &dc_ss ) ) {
+                               tc_status = W_ERROR_V(WERR_NO_LOGON_SERVERS);
                                break;
                        }
 
-                       fstr_sprintf( dc_name, "\\\\%s", dc_name2 );
-                               
-                       tc_status = NO_ERROR;
-                       
+                       dc_name = talloc_asprintf(p->mem_ctx, "\\\\%s", dc_name2);
+                       if (!dc_name) {
+                               return WERR_NOMEM;
+                       }
+
+                       tc_status = W_ERROR_V(WERR_OK);
+
                        break;
-                       
+
                default:
                        /* no idea what this should be */
-                       DEBUG(0,("_net_logon_ctrl2: unimplemented function level [%d]\n",
-                               q_u->function_code));
+                       DEBUG(0,("_netr_LogonControl2: unimplemented function level [%d]\n",
+                               r->in.function_code));
+                       return WERR_UNKNOWN_LEVEL;
        }
-       
+
        /* prepare the response */
-       
-       init_net_r_logon_ctrl2( r_u, q_u->query_level, flags, 
-               pdc_connection_status, logon_attempts, tc_status, dc_name );
 
-        if (lp_server_role() == ROLE_DOMAIN_BDC)
+       switch (r->in.level) {
+               case 1:
+                       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);
+                       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);
+                       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);
+                       r->out.query->info3 = info3;
+                       break;
+               default:
+                       return WERR_UNKNOWN_LEVEL;
+       }
+
+        if (lp_server_role() == ROLE_DOMAIN_BDC) {
                 send_sync_message();
+       }
 
-       return r_u->status;
+       return WERR_OK;
 }
 
 /*************************************************************************
- net_reply_trust_dom_list:
+ _netr_NetrEnumerateTrustedDomains
  *************************************************************************/
 
-NTSTATUS _net_trust_dom_list(pipes_struct *p, NET_Q_TRUST_DOM_LIST *q_u, NET_R_TRUST_DOM_LIST *r_u)
+WERROR _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
+                                        struct netr_NetrEnumerateTrustedDomains *r)
 {
-       const char *trusted_domain = "test_domain";
-       uint32 num_trust_domains = 1;
+       struct netr_Blob trusted_domains_blob;
+       DATA_BLOB blob;
 
-       DEBUG(6,("_net_trust_dom_list: %d\n", __LINE__));
+       DEBUG(6,("_netr_NetrEnumerateTrustedDomains: %d\n", __LINE__));
 
        /* set up the Trusted Domain List response */
-       init_r_trust_dom(r_u, num_trust_domains, trusted_domain);
-
-       DEBUG(6,("_net_trust_dom_list: %d\n", __LINE__));
-
-       return r_u->status;
-}
 
-/***********************************************************************************
- init_net_r_srv_pwset:
- ***********************************************************************************/
+       blob = data_blob_talloc_zero(p->mem_ctx, 2);
+       trusted_domains_blob.data = blob.data;
+       trusted_domains_blob.length = blob.length;
 
-static void init_net_r_srv_pwset(NET_R_SRV_PWSET *r_s,
-                                DOM_CRED *srv_cred, NTSTATUS status)  
-{
-       DEBUG(5,("init_net_r_srv_pwset: %d\n", __LINE__));
+       DEBUG(6,("_netr_NetrEnumerateTrustedDomains: %d\n", __LINE__));
 
-       memcpy(&r_s->srv_cred, srv_cred, sizeof(r_s->srv_cred));
-       r_s->status = status;
+       *r->out.trusted_domains_blob = trusted_domains_blob;
 
-       DEBUG(5,("init_net_r_srv_pwset: %d\n", __LINE__));
+       return WERR_OK;
 }
 
 /******************************************************************
  gets a machine password entry.  checks access rights of the host.
  ******************************************************************/
 
-static BOOL get_md4pw(char *md4pw, char *mach_acct)
+static NTSTATUS get_md4pw(char *md4pw, const char *mach_acct, uint16 sec_chan_type)
 {
-       SAM_ACCOUNT *sampass = NULL;
+       struct samu *sampass = NULL;
        const uint8 *pass;
-       BOOL ret;
+       bool ret;
        uint32 acct_ctrl;
 
 #if 0
+       char addr[INET6_ADDRSTRLEN];
+
     /*
      * Currently this code is redundent as we already have a filter
-     * by hostname list. What this code really needs to do is to 
+     * by hostname list. What this code really needs to do is to
      * get a hosts allowed/hosts denied list from the SAM database
      * on a per user basis, and make the access decision there.
      * I will leave this code here for now as a reminder to implement
@@ -222,295 +286,370 @@ static BOOL get_md4pw(char *md4pw, char *mach_acct)
      */
 
        if (!allow_access(lp_domain_hostsdeny(), lp_domain_hostsallow(),
-                         client_name(), client_addr()))
-       {
+                       client_name(get_client_fd()),
+                       client_addr(get_client_fd(),addr,sizeof(addr)))) {
                DEBUG(0,("get_md4pw: Workstation %s denied access to domain\n", mach_acct));
                return False;
        }
 #endif /* 0 */
 
-       if(!NT_STATUS_IS_OK(pdb_init_sam(&sampass)))
-               return False;
+       if ( !(sampass = samu_new( NULL )) ) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        /* JRA. This is ok as it is only used for generating the challenge. */
        become_root();
-       ret=pdb_getsampwnam(sampass, mach_acct);
+       ret = pdb_getsampwnam(sampass, mach_acct);
        unbecome_root();
-       if (ret==False) {
+
+       if (!ret) {
                DEBUG(0,("get_md4pw: Workstation %s: no account in domain\n", mach_acct));
-               pdb_free_sam(&sampass);
-               return False;
+               TALLOC_FREE(sampass);
+               return NT_STATUS_ACCESS_DENIED;
        }
 
        acct_ctrl = pdb_get_acct_ctrl(sampass);
-       if (!(acct_ctrl & ACB_DISABLED) &&
-           ((acct_ctrl & ACB_DOMTRUST) ||
-            (acct_ctrl & ACB_WSTRUST) ||
-            (acct_ctrl & ACB_SVRTRUST)) &&
-           ((pass=pdb_get_nt_passwd(sampass)) != NULL)) {
-               memcpy(md4pw, pass, 16);
-               dump_data(5, md4pw, 16);
-               pdb_free_sam(&sampass);
-               return True;
+       if (acct_ctrl & ACB_DISABLED) {
+               DEBUG(0,("get_md4pw: Workstation %s: account is disabled\n", mach_acct));
+               TALLOC_FREE(sampass);
+               return NT_STATUS_ACCOUNT_DISABLED;
+       }
+
+       if (!(acct_ctrl & ACB_SVRTRUST) &&
+           !(acct_ctrl & ACB_WSTRUST) &&
+           !(acct_ctrl & ACB_DOMTRUST))
+       {
+               DEBUG(0,("get_md4pw: Workstation %s: account is not a trust account\n", mach_acct));
+               TALLOC_FREE(sampass);
+               return NT_STATUS_NO_TRUST_SAM_ACCOUNT;
        }
-       
-       DEBUG(0,("get_md4pw: Workstation %s: no account in domain\n", mach_acct));
-       pdb_free_sam(&sampass);
-       return False;
+
+       switch (sec_chan_type) {
+               case SEC_CHAN_BDC:
+                       if (!(acct_ctrl & ACB_SVRTRUST)) {
+                               DEBUG(0,("get_md4pw: Workstation %s: BDC secure channel requested "
+                                        "but not a server trust account\n", mach_acct));
+                               TALLOC_FREE(sampass);
+                               return NT_STATUS_NO_TRUST_SAM_ACCOUNT;
+                       }
+                       break;
+               case SEC_CHAN_WKSTA:
+                       if (!(acct_ctrl & ACB_WSTRUST)) {
+                               DEBUG(0,("get_md4pw: Workstation %s: WORKSTATION secure channel requested "
+                                        "but not a workstation trust account\n", mach_acct));
+                               TALLOC_FREE(sampass);
+                               return NT_STATUS_NO_TRUST_SAM_ACCOUNT;
+                       }
+                       break;
+               case SEC_CHAN_DOMAIN:
+                       if (!(acct_ctrl & ACB_DOMTRUST)) {
+                               DEBUG(0,("get_md4pw: Workstation %s: DOMAIN secure channel requested "
+                                        "but not a interdomain trust account\n", mach_acct));
+                               TALLOC_FREE(sampass);
+                               return NT_STATUS_NO_TRUST_SAM_ACCOUNT;
+                       }
+                       break;
+               default:
+                       break;
+       }
+
+       if ((pass = pdb_get_nt_passwd(sampass)) == NULL) {
+               DEBUG(0,("get_md4pw: Workstation %s: account does not have a password\n", mach_acct));
+               TALLOC_FREE(sampass);
+               return NT_STATUS_LOGON_FAILURE;
+       }
+
+       memcpy(md4pw, pass, 16);
+       dump_data(5, (uint8 *)md4pw, 16);
+
+       TALLOC_FREE(sampass);
+
+       return NT_STATUS_OK;
+
 
 }
 
 /*************************************************************************
- _net_req_chal
+ _netr_ServerReqChallenge
  *************************************************************************/
 
-NTSTATUS _net_req_chal(pipes_struct *p, NET_Q_REQ_CHAL *q_u, NET_R_REQ_CHAL *r_u)
+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;
                }
        } else {
-               DEBUG(10,("_net_req_chal: new challenge requested. Clearing old state.\n"));
+               DEBUG(10,("_netr_ServerReqChallenge: new challenge requested. Clearing old state.\n"));
                ZERO_STRUCTP(p->dc);
        }
 
-       rpcstr_pull(p->dc->remote_machine,
-                       q_u->uni_logon_clnt.buffer,
-                       sizeof(fstring),q_u->uni_logon_clnt.uni_str_len*2,0);
+       fstrcpy(p->dc->remote_machine, r->in.computer_name);
 
        /* Save the client challenge to the server. */
-       memcpy(p->dc->clnt_chal.data, q_u->clnt_chal.data, sizeof(q_u->clnt_chal.data));
+       memcpy(p->dc->clnt_chal.data, r->in.credentials->data,
+               sizeof(r->in.credentials->data));
 
        /* Create a server challenge for the client */
        /* Set this to a random value. */
        generate_random_buffer(p->dc->srv_chal.data, 8);
-       
+
        /* set up the LSA REQUEST CHALLENGE response */
-       init_net_r_req_chal(r_u, &p->dc->srv_chal, NT_STATUS_OK);
-       
+       init_net_r_req_chal(r->out.return_credentials, &p->dc->srv_chal);
+
        p->dc->challenge_sent = True;
 
        return NT_STATUS_OK;
 }
 
 /*************************************************************************
- init_net_r_auth:
+ _netr_ServerAuthenticate
+ Create the initial credentials.
  *************************************************************************/
 
-static void init_net_r_auth(NET_R_AUTH *r_a, DOM_CHAL *resp_cred, NTSTATUS status)
+NTSTATUS _netr_ServerAuthenticate(pipes_struct *p,
+                                 struct netr_ServerAuthenticate *r)
 {
-       memcpy(r_a->srv_chal.data, resp_cred->data, sizeof(resp_cred->data));
-       r_a->status = status;
-}
-
-/*************************************************************************
- _net_auth. Create the initial credentials.
- *************************************************************************/
-
-NTSTATUS _net_auth(pipes_struct *p, NET_Q_AUTH *q_u, NET_R_AUTH *r_u)
-{
-       fstring mach_acct;
-       fstring remote_machine;
-       DOM_CHAL srv_chal_out;
+       NTSTATUS status;
+       struct netr_Credential srv_chal_out;
 
        if (!p->dc || !p->dc->challenge_sent) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       rpcstr_pull(mach_acct, q_u->clnt_id.uni_acct_name.buffer,sizeof(fstring),
-                               q_u->clnt_id.uni_acct_name.uni_str_len*2,0);
-       rpcstr_pull(remote_machine, q_u->clnt_id.uni_comp_name.buffer,sizeof(fstring),
-                               q_u->clnt_id.uni_comp_name.uni_str_len*2,0);
-
-       if (!get_md4pw((char *)p->dc->mach_pw, mach_acct)) {
-               DEBUG(0,("_net_auth: creds_server_check failed. Failed to "
-                       "get pasword for machine account %s "
-                       "from client %s\n",
-                       mach_acct, remote_machine ));
+       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;
        }
 
        /* From the client / server challenges and md4 password, generate sess key */
-       creds_server_init(p->dc,
+       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); 
+                       &srv_chal_out);
 
        /* Check client credentials are valid. */
-       if (!creds_server_check(p->dc, &q_u->clnt_chal)) {
-               DEBUG(0,("_net_auth: creds_server_check failed. Rejecting auth "
+       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",
-                       remote_machine, mach_acct ));
+                       r->in.computer_name,
+                       r->in.account_name));
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       fstrcpy(p->dc->mach_acct, mach_acct);
-       fstrcpy(p->dc->remote_machine, remote_machine);
+       fstrcpy(p->dc->mach_acct, r->in.account_name);
+       fstrcpy(p->dc->remote_machine, r->in.computer_name);
        p->dc->authenticated = True;
 
        /* set up the LSA AUTH response */
        /* Return the server credentials. */
-       init_net_r_auth(r_u, &srv_chal_out, NT_STATUS_OK);
-
-       return r_u->status;
-}
 
-/*************************************************************************
- init_net_r_auth_2:
- *************************************************************************/
+       memcpy(r->out.return_credentials->data, &srv_chal_out.data,
+              sizeof(r->out.return_credentials->data));
 
-static void init_net_r_auth_2(NET_R_AUTH_2 *r_a,
-                              DOM_CHAL *resp_cred, NEG_FLAGS *flgs, NTSTATUS status)
-{
-       memcpy(r_a->srv_chal.data, resp_cred->data, sizeof(resp_cred->data));
-       memcpy(&r_a->srv_flgs, flgs, sizeof(r_a->srv_flgs));
-       r_a->status = status;
+       return NT_STATUS_OK;
 }
 
 /*************************************************************************
- _net_auth_2
+ _netr_ServerAuthenticate2
  *************************************************************************/
 
-NTSTATUS _net_auth_2(pipes_struct *p, NET_Q_AUTH_2 *q_u, NET_R_AUTH_2 *r_u)
+NTSTATUS _netr_ServerAuthenticate2(pipes_struct *p,
+                                  struct netr_ServerAuthenticate2 *r)
 {
-       NEG_FLAGS srv_flgs;
-       fstring mach_acct;
-       fstring remote_machine;
-       DOM_CHAL srv_chal_out;
+       NTSTATUS status;
+       uint32_t srv_flgs;
+       struct netr_Credential srv_chal_out;
 
-       rpcstr_pull(mach_acct, q_u->clnt_id.uni_acct_name.buffer,sizeof(fstring),
-                               q_u->clnt_id.uni_acct_name.uni_str_len*2,0);
-       rpcstr_pull(remote_machine, q_u->clnt_id.uni_comp_name.buffer,sizeof(fstring),
-                               q_u->clnt_id.uni_comp_name.uni_str_len*2,0);
+       /* We use this as the key to store the creds: */
+       /* r->in.computer_name */
 
        if (!p->dc || !p->dc->challenge_sent) {
-               DEBUG(0,("_net_auth2: no challenge sent to client %s\n",
-                       remote_machine ));
+               DEBUG(0,("_netr_ServerAuthenticate2: no challenge sent to client %s\n",
+                       r->in.computer_name));
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       if ( (lp_server_schannel() == True) &&
-            ((q_u->clnt_flgs.neg_flags & NETLOGON_NEG_SCHANNEL) == 0) ) {
+       if ( (lp_server_schannel() == true) &&
+            ((*r->in.negotiate_flags & NETLOGON_NEG_SCHANNEL) == 0) ) {
 
                /* schannel must be used, but client did not offer it. */
-               DEBUG(0,("_net_auth2: schannel required but client failed "
+               DEBUG(0,("_netr_ServerAuthenticate2: schannel required but client failed "
                        "to offer it. Client was %s\n",
-                       mach_acct ));
+                       r->in.account_name));
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       if (!get_md4pw((char *)p->dc->mach_pw, mach_acct)) {
-               DEBUG(0,("_net_auth2: failed to get machine password for "
-                       "account %s\n",
-                       mach_acct ));
+       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_ServerAuthenticate2: failed to get machine password for "
+                       "account %s: %s\n",
+                       r->in.account_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(p->dc,
+       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); 
+                       &srv_chal_out);
 
        /* Check client credentials are valid. */
-       if (!creds_server_check(p->dc, &q_u->clnt_chal)) {
-               DEBUG(0,("_net_auth2: creds_server_check failed. Rejecting auth "
+       if (!netlogon_creds_server_check(p->dc, r->in.credentials)) {
+               DEBUG(0,("_netr_ServerAuthenticate2: netlogon_creds_server_check failed. Rejecting auth "
                        "request from client %s machine account %s\n",
-                       remote_machine, mach_acct ));
+                       r->in.computer_name,
+                       r->in.account_name));
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       srv_flgs.neg_flags = 0x000001ff;
-
-       if (lp_server_schannel() != False) {
-               srv_flgs.neg_flags |= NETLOGON_NEG_SCHANNEL;
+       /* 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;
+
+       if (lp_server_schannel() != false) {
+               srv_flgs |= NETLOGON_NEG_SCHANNEL;
        }
 
        /* set up the LSA AUTH 2 response */
-       init_net_r_auth_2(r_u, &srv_chal_out, &srv_flgs, NT_STATUS_OK);
+       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, mach_acct);
-       fstrcpy(p->dc->remote_machine, remote_machine);
+       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;
 
        /* Store off the state so we can continue after client disconnect. */
        become_root();
-       secrets_store_schannel_session_info(p->mem_ctx, p->dc);
+       secrets_store_schannel_session_info(p->mem_ctx,
+                                           r->in.computer_name,
+                                           p->dc);
        unbecome_root();
 
-       return r_u->status;
+       return NT_STATUS_OK;
 }
 
 /*************************************************************************
- _net_srv_pwset
+ _netr_ServerPasswordSet
  *************************************************************************/
 
-NTSTATUS _net_srv_pwset(pipes_struct *p, NET_Q_SRV_PWSET *q_u, NET_R_SRV_PWSET *r_u)
+NTSTATUS _netr_ServerPasswordSet(pipes_struct *p,
+                                struct netr_ServerPasswordSet *r)
 {
-       NTSTATUS status = NT_STATUS_ACCESS_DENIED;
-       fstring workstation;
-       SAM_ACCOUNT *sampass=NULL;
-       BOOL ret = False;
+       NTSTATUS status = NT_STATUS_OK;
+       fstring remote_machine;
+       struct samu *sampass=NULL;
+       bool ret = False;
        unsigned char pwd[16];
        int i;
        uint32 acct_ctrl;
-       DOM_CRED cred_out;
+       struct netr_Authenticator cred_out;
        const uchar *old_pw;
 
+       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));
+
        /* Step the creds chain forward. */
-       if (!creds_server_step(p->dc, &q_u->clnt_id.cred, &cred_out)) {
-               DEBUG(0,("_net_srv_pwset: creds_server_step failed. Rejecting auth "
+       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",
-                       p->dc->remote_machine, p->dc->mach_acct ));
-               return NT_STATUS_ACCESS_DENIED;
+                       remote_machine, p->dc->mach_acct ));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       DEBUG(5,("_net_srv_pwset: %d\n", __LINE__));
-
-       rpcstr_pull(workstation,q_u->clnt_id.login.uni_comp_name.buffer,
-                   sizeof(workstation),q_u->clnt_id.login.uni_comp_name.uni_str_len*2,0);
-
-       DEBUG(3,("_net_srv_pwset: Server Password Set by Wksta:[%s] on account [%s]\n",
-                       workstation, p->dc->mach_acct));
-       
-       pdb_init_sam(&sampass);
+       /* We must store the creds state after an update. */
+       sampass = samu_new( NULL );
+       if (!sampass) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        become_root();
-       ret=pdb_getsampwnam(sampass, p->dc->mach_acct);
+       secrets_store_schannel_session_info(p, remote_machine, p->dc);
+       ret = pdb_getsampwnam(sampass, p->dc->mach_acct);
        unbecome_root();
 
+       if (!ret) {
+               TALLOC_FREE(sampass);
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
        /* Ensure the account exists and is a machine account. */
-       
+
        acct_ctrl = pdb_get_acct_ctrl(sampass);
 
-       if (!(ret 
-             && (acct_ctrl & ACB_WSTRUST ||
+       if (!(acct_ctrl & ACB_WSTRUST ||
                      acct_ctrl & ACB_SVRTRUST ||
-                     acct_ctrl & ACB_DOMTRUST))) {
-               pdb_free_sam(&sampass);
+                     acct_ctrl & ACB_DOMTRUST)) {
+               TALLOC_FREE(sampass);
                return NT_STATUS_NO_SUCH_USER;
        }
-       
+
        if (pdb_get_acct_ctrl(sampass) & ACB_DISABLED) {
-               pdb_free_sam(&sampass);
+               TALLOC_FREE(sampass);
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
        /* Woah - what does this to to the credential chain ? JRA */
-       cred_hash3( pwd, q_u->pwd, p->dc->sess_key, 0);
+       cred_hash3(pwd, r->in.new_password->hash, p->dc->sess_key, 0);
 
-       DEBUG(100,("Server password set : new given value was :\n"));
+       DEBUG(100,("_netr_ServerPasswordSet: new given value was :\n"));
        for(i = 0; i < sizeof(pwd); i++)
                DEBUG(100,("%02X ", pwd[i]));
        DEBUG(100,("\n"));
@@ -518,7 +657,7 @@ NTSTATUS _net_srv_pwset(pipes_struct *p, NET_Q_SRV_PWSET *q_u, NET_R_SRV_PWSET *
        old_pw = pdb_get_nt_passwd(sampass);
 
        if (old_pw && memcmp(pwd, old_pw, 16) == 0) {
-               /* Avoid backend modificiations and other fun if the 
+               /* Avoid backend modificiations and other fun if the
                   client changed the password to the *same thing* */
 
                ret = True;
@@ -526,135 +665,197 @@ NTSTATUS _net_srv_pwset(pipes_struct *p, NET_Q_SRV_PWSET *q_u, NET_R_SRV_PWSET *
 
                /* LM password should be NULL for machines */
                if (!pdb_set_lanman_passwd(sampass, NULL, PDB_CHANGED)) {
-                       pdb_free_sam(&sampass);
+                       TALLOC_FREE(sampass);
                        return NT_STATUS_NO_MEMORY;
                }
-               
+
                if (!pdb_set_nt_passwd(sampass, pwd, PDB_CHANGED)) {
-                       pdb_free_sam(&sampass);
+                       TALLOC_FREE(sampass);
                        return NT_STATUS_NO_MEMORY;
                }
-               
-               if (!pdb_set_pass_changed_now(sampass)) {
-                       pdb_free_sam(&sampass);
+
+               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; 
+                       return NT_STATUS_UNSUCCESSFUL;
                }
-               
+
                become_root();
-               ret = pdb_update_sam_account (sampass);
+               status = pdb_update_sam_account(sampass);
                unbecome_root();
        }
-       if (ret) {
-               status = NT_STATUS_OK;
-       }
 
        /* set up the LSA Server Password Set response */
-       init_net_r_srv_pwset(r_u, &cred_out, status);
 
-       pdb_free_sam(&sampass);
-       return r_u->status;
+       memcpy(r->out.return_authenticator, &cred_out,
+              sizeof(r->out.return_authenticator));
+
+       TALLOC_FREE(sampass);
+       return status;
 }
 
 /*************************************************************************
- _net_sam_logoff:
+ _netr_LogonSamLogoff
  *************************************************************************/
 
-NTSTATUS _net_sam_logoff(pipes_struct *p, NET_Q_SAM_LOGOFF *q_u, NET_R_SAM_LOGOFF *r_u)
+NTSTATUS _netr_LogonSamLogoff(pipes_struct *p,
+                             struct netr_LogonSamLogoff *r)
 {
-       if (!get_valid_user_struct(p->vuid))
-               return NT_STATUS_NO_SUCH_USER;
+       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;
        }
 
-       r_u->buffer_creds = 1; /* yes, we have valid server credentials */
-
        /* checks and updates credentials.  creates reply credentials */
-       if (!creds_server_step(p->dc, &q_u->sam_id.client.cred, &r_u->srv_creds)) {
-               DEBUG(0,("_net_sam_logoff: creds_server_step failed. Rejecting auth "
+       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",
-                       p->dc->remote_machine, p->dc->mach_acct ));
-               return NT_STATUS_ACCESS_DENIED;
+                       r->in.computer_name, p->dc->mach_acct ));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       r_u->status = NT_STATUS_OK;
-       return r_u->status;
-}
+       /* 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();
 
+       return NT_STATUS_OK;
+}
 
 /*************************************************************************
- _net_sam_logon
+ _netr_LogonSamLogon
  *************************************************************************/
 
-NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *r_u)
+NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
+                            struct netr_LogonSamLogon *r)
 {
        NTSTATUS status = NT_STATUS_OK;
-       NET_USER_INFO_3 *usr_info = NULL;
-       NET_ID_INFO_CTR *ctr = q_u->sam_id.ctr;
-       UNISTR2 *uni_samlogon_user = NULL;
-       UNISTR2 *uni_samlogon_domain = NULL;
-       UNISTR2 *uni_samlogon_workstation = NULL;
+       struct netr_SamInfo3 *sam3 = NULL;
+       union netr_LogonLevel *logon = r->in.logon;
        fstring nt_username, nt_domain, nt_workstation;
        auth_usersupplied_info *user_info = NULL;
        auth_serversupplied_info *server_info = NULL;
-       SAM_ACCOUNT *sampw;
        struct auth_context *auth_context = NULL;
-               
-       usr_info = TALLOC_P(p->mem_ctx, NET_USER_INFO_3);
-       if (!usr_info)
-               return NT_STATUS_NO_MEMORY;
-
-       ZERO_STRUCTP(usr_info);
+       uint8_t pipe_session_key[16];
+       bool process_creds = true;
 
-       /* store the user information, if there is any. */
-       r_u->user = usr_info;
-       r_u->switch_value = 0; /* indicates no info */
-       r_u->auth_resp = 1; /* authoritative response */
-       r_u->switch_value = 3; /* indicates type of validation user info */
-       r_u->buffer_creds = 1; /* Ensure we always return server creds. */
-       if (!get_valid_user_struct(p->vuid))
-               return NT_STATUS_NO_SUCH_USER;
-
-       if (!p->dc || !p->dc->authenticated) {
-               return NT_STATUS_INVALID_HANDLE;
+       switch (p->hdr_req.opnum) {
+               case NDR_NETR_LOGONSAMLOGON:
+                       process_creds = true;
+                       break;
+               case NDR_NETR_LOGONSAMLOGONEX:
+               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,("_net_sam_logoff: client %s not using schannel for netlogon\n",
-                       p->dc->remote_machine ));
+               DEBUG(0,("_netr_LogonSamLogon: client %s not using schannel for netlogon\n",
+                       get_remote_machine_name() ));
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       /* checks and updates credentials.  creates reply credentials */
-       if (!creds_server_step(p->dc, &q_u->sam_id.client.cred,  &r_u->srv_creds)) {
-               DEBUG(0,("_net_sam_logoff: creds_server_step failed. Rejecting auth "
-                       "request from client %s machine account %s\n",
-                       p->dc->remote_machine, p->dc->mach_acct ));
+       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;
        }
 
-       /* find the username */
-    
-       switch (q_u->sam_id.logon_level) {
-       case INTERACTIVE_LOGON_TYPE:
-               uni_samlogon_user = &ctr->auth.id1.uni_user_name;
-               uni_samlogon_domain = &ctr->auth.id1.uni_domain_name;
+       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, remote_machine, &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_LogonSamLogon: 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;
+               }
+
+               /* We must store the creds state after an update. */
+               become_root();
+               secrets_store_schannel_session_info(p, remote_machine, p->dc);
+               unbecome_root();
+       }
+
+       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);
 
-                uni_samlogon_workstation = &ctr->auth.id1.uni_wksta_name;
-            
                DEBUG(3,("SAM Logon (Interactive). Domain:[%s].  ", lp_workgroup()));
                break;
-       case NET_LOGON_TYPE:
-               uni_samlogon_user = &ctr->auth.id2.uni_user_name;
-               uni_samlogon_domain = &ctr->auth.id2.uni_domain_name;
-               uni_samlogon_workstation = &ctr->auth.id2.uni_wksta_name;
-            
+       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);
+
                DEBUG(3,("SAM Logon (Network). Domain:[%s].  ", lp_workgroup()));
                break;
        default:
@@ -662,26 +863,23 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                return NT_STATUS_INVALID_INFO_CLASS;
        } /* end switch */
 
-       rpcstr_pull(nt_username,uni_samlogon_user->buffer,sizeof(nt_username),uni_samlogon_user->uni_str_len*2,0);
-       rpcstr_pull(nt_domain,uni_samlogon_domain->buffer,sizeof(nt_domain),uni_samlogon_domain->uni_str_len*2,0);
-       rpcstr_pull(nt_workstation,uni_samlogon_workstation->buffer,sizeof(nt_workstation),uni_samlogon_workstation->uni_str_len*2,0);
-
-       DEBUG(3,("User:[%s@%s] Requested Domain:[%s]\n", nt_username, 
-                 nt_workstation, nt_domain));
-       
+       DEBUG(3,("User:[%s@%s] Requested Domain:[%s]\n", nt_username, nt_workstation, nt_domain));
        fstrcpy(current_user_info.smb_name, nt_username);
        sub_set_smb_name(nt_username);
-     
-       DEBUG(5,("Attempting validation level %d for unmapped username %s.\n", q_u->sam_id.ctr->switch_value, nt_username));
+
+       DEBUG(5,("Attempting validation level %d for unmapped username %s.\n",
+               r->in.validation_level, nt_username));
 
        status = NT_STATUS_OK;
-       
-       switch (ctr->switch_value) {
-       case NET_LOGON_TYPE:
+
+       switch (r->in.logon_level) {
+       case NetlogonNetworkInformation:
        {
                const char *wksname = nt_workstation;
-               
-               if (!NT_STATUS_IS_OK(status = make_auth_context_fixed(&auth_context, ctr->auth.id2.lm_chal))) {
+
+               status = make_auth_context_fixed(&auth_context,
+                                                logon->network->challenge);
+               if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
 
@@ -692,36 +890,39 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                if (*wksname == '\\') wksname++;
 
                /* Standard challenge/response authenticaion */
-               if (!make_user_info_netlogon_network(&user_info, 
-                                                    nt_username, nt_domain, 
+               if (!make_user_info_netlogon_network(&user_info,
+                                                    nt_username, nt_domain,
                                                     wksname,
-                                                    ctr->auth.id2.lm_chal_resp.buffer,
-                                                    ctr->auth.id2.lm_chal_resp.str_str_len,
-                                                    ctr->auth.id2.nt_chal_resp.buffer,
-                                                    ctr->auth.id2.nt_chal_resp.str_str_len)) {
+                                                    logon->network->identity_info.parameter_control,
+                                                    logon->network->lm.data,
+                                                    logon->network->lm.length,
+                                                    logon->network->nt.data,
+                                                    logon->network->nt.length)) {
                        status = NT_STATUS_NO_MEMORY;
-               }       
+               }
                break;
        }
-       case INTERACTIVE_LOGON_TYPE:
-               /* 'Interactive' autheticaion, supplies the password in its
-                  MD4 form, encrypted with the session key.  We will
-                  convert this to chellange/responce for the auth
-                  subsystem to chew on */
+       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;
-               
+
                if (!NT_STATUS_IS_OK(status = make_auth_context_subsystem(&auth_context))) {
                        return status;
                }
-               
+
                chal = auth_context->get_ntlm_challenge(auth_context);
 
-               if (!make_user_info_netlogon_interactive(&user_info, 
-                                                        nt_username, nt_domain, 
-                                                        nt_workstation, chal,
-                                                        ctr->auth.id1.lm_owf.data, 
-                                                        ctr->auth.id1.nt_owf.data, 
+               if (!make_user_info_netlogon_interactive(&user_info,
+                                                        nt_username, nt_domain,
+                                                        nt_workstation,
+                                                        logon->password->identity_info.parameter_control,
+                                                        chal,
+                                                        logon->password->lmpassword.hash,
+                                                        logon->password->ntpassword.hash,
                                                         p->dc->sess_key)) {
                        status = NT_STATUS_NO_MEMORY;
                }
@@ -731,160 +932,483 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                DEBUG(2,("SAM Logon: unsupported switch value\n"));
                return NT_STATUS_INVALID_INFO_CLASS;
        } /* end switch */
-       
+
        if ( NT_STATUS_IS_OK(status) ) {
-               status = auth_context->check_ntlm_password(auth_context, 
+               status = auth_context->check_ntlm_password(auth_context,
                        user_info, &server_info);
        }
 
-       (auth_context->free)(&auth_context);    
+       (auth_context->free)(&auth_context);
        free_user_info(&user_info);
-       
-       DEBUG(5, ("_net_sam_logon: check_password returned status %s\n", 
+
+       DEBUG(5,("_netr_LogonSamLogon: check_password returned status %s\n",
                  nt_errstr(status)));
 
        /* Check account and password */
-    
+
        if (!NT_STATUS_IS_OK(status)) {
-               /* If we don't know what this domain is, we need to 
-                  indicate that we are not authoritative.  This 
-                  allows the client to decide if it needs to try 
+               /* If we don't know what this domain is, we need to
+                  indicate that we are not authoritative.  This
+                  allows the client to decide if it needs to try
                   a local user.  Fix by jpjanosi@us.ibm.com, #2976 */
-                if ( NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER) 
+                if ( NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)
                     && !strequal(nt_domain, get_global_sam_name())
                     && !is_trusted_domain(nt_domain) )
-                       r_u->auth_resp = 0; /* We are not authoritative */
+                       *r->out.authoritative = false; /* We are not authoritative */
 
-               free_server_info(&server_info);
+               TALLOC_FREE(server_info);
                return status;
        }
 
        if (server_info->guest) {
                /* We don't like guest domain logons... */
-               DEBUG(5,("_net_sam_logon: Attempted domain logon as GUEST denied.\n"));
-               free_server_info(&server_info);
+               DEBUG(5,("_netr_LogonSamLogon: Attempted domain logon as GUEST "
+                        "denied.\n"));
+               TALLOC_FREE(server_info);
                return NT_STATUS_LOGON_FAILURE;
        }
 
        /* This is the point at which, if the login was successful, that
            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;
-               pstring my_name;
-               fstring user_sid_string;
-               fstring group_sid_string;
-               uchar user_session_key[16];
-               uchar lm_session_key[16];
-               uchar netlogon_sess_key[16];
-
-               sampw = server_info->sam_account;
-
-               /* set up pointer indicating user/password failed to be found */
-               usr_info->ptr_user_info = 0;
-
-               user_sid = pdb_get_user_sid(sampw);
-               group_sid = pdb_get_group_sid(sampw);
-
-               sid_copy(&domain_sid, user_sid);
-               sid_split_rid(&domain_sid, &user_rid);
-
-               if (!sid_peek_check_rid(&domain_sid, group_sid, &group_rid)) {
-                       DEBUG(1, ("_net_sam_logon: user %s\\%s has user sid %s\n but group sid %s.\nThe conflicting domain portions are not supported for NETLOGON calls\n",        
-                                 pdb_get_domain(sampw), pdb_get_username(sampw),
-                                 sid_to_string(user_sid_string, user_sid),
-                                 sid_to_string(group_sid_string, group_sid)));
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
-               
-               
-               if(server_info->login_server) {
-                       pstrcpy(my_name, server_info->login_server);
-               } else {
-                       pstrcpy(my_name, global_myname());
-               }
-               
-               if (!NT_STATUS_IS_OK(status 
-                                    = nt_token_to_group_list(p->mem_ctx, 
-                                                             &domain_sid, 
-                                                             server_info->ptok, 
-                                                             &num_gids, 
-                                                             &gids))) {
-                       return status;
-               }
 
-               ZERO_STRUCT(netlogon_sess_key);
-               memcpy(netlogon_sess_key, p->dc->sess_key, 8);
-               if (server_info->user_session_key.length) {
-                       memcpy(user_session_key, server_info->user_session_key.data, 
-                              MIN(sizeof(user_session_key), server_info->user_session_key.length));
-                       SamOEMhash(user_session_key, netlogon_sess_key, 16);
-               }
-               if (server_info->lm_session_key.length) {
-                       memcpy(lm_session_key, server_info->lm_session_key.data, 
-                              MIN(sizeof(lm_session_key), server_info->lm_session_key.length));
-                       SamOEMhash(lm_session_key, netlogon_sess_key, 16);
+       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;
                }
-               ZERO_STRUCT(netlogon_sess_key);
-               
-               init_net_user_info3(p->mem_ctx, usr_info, 
-                                   user_rid,
-                                   group_rid,   
-                                   pdb_get_username(sampw),
-                                   pdb_get_fullname(sampw),
-                                   pdb_get_homedir(sampw),
-                                   pdb_get_dir_drive(sampw),
-                                   pdb_get_logon_script(sampw),
-                                   pdb_get_profile_path(sampw),
-                                   pdb_get_logon_time(sampw),
-                                   get_time_t_max(),
-                                   get_time_t_max(),
-                                   pdb_get_pass_last_set_time(sampw),
-                                   pdb_get_pass_can_change_time(sampw),
-                                   pdb_get_pass_must_change_time(sampw),
-                                   
-                                   0, /* logon_count */
-                                   0, /* bad_pw_count */
-                                   num_gids,    /* uint32 num_groups */
-                                   gids    , /* DOM_GID *gids */
-                                   0x20    , /* uint32 user_flgs (?) */
-                                   server_info->user_session_key.length ? user_session_key : NULL,
-                                   server_info->lm_session_key.length ? lm_session_key : NULL,
-                                   my_name     , /* char *logon_srv */
-                                   pdb_get_domain(sampw),
-                                   &domain_sid,     /* DOM_SID *dom_sid */  
-                                   /* Should be users domain sid, not servers - for trusted domains */
-                                 
-                                   NULL); /* char *other_sids */
-               ZERO_STRUCT(user_session_key);
-               ZERO_STRUCT(lm_session_key);
-       }
-       free_server_info(&server_info);
+               memcpy(pipe_session_key, p->auth.a_u.schannel_auth->sess_key, 16);
+       }
+
+       status = serverinfo_to_SamInfo3(server_info, pipe_session_key, sam3);
+       TALLOC_FREE(server_info);
        return status;
 }
 
+/*************************************************************************
+ _netr_LogonSamLogonEx
+ - no credential chaining. Map into net sam logon.
+ *************************************************************************/
+
+NTSTATUS _netr_LogonSamLogonEx(pipes_struct *p,
+                              struct netr_LogonSamLogonEx *r)
+{
+       struct netr_LogonSamLogon q;
+
+       /* 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",
+                       get_remote_machine_name() ));
+               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; */
+
+       return _netr_LogonSamLogon(p, &q);
+}
+
 /*************************************************************************
  _ds_enum_dom_trusts
  *************************************************************************/
 #if 0  /* JERRY -- not correct */
-NTSTATUS _ds_enum_dom_trusts(pipes_struct *p, DS_Q_ENUM_DOM_TRUSTS *q_u,
+ NTSTATUS _ds_enum_dom_trusts(pipes_struct *p, DS_Q_ENUM_DOM_TRUSTS *q_u,
                             DS_R_ENUM_DOM_TRUSTS *r_u)
 {
        NTSTATUS status = NT_STATUS_OK;
 
-       /* TODO: According to MSDN, the can only be executed against a 
+       /* TODO: According to MSDN, the can only be executed against a
           DC or domain member running Windows 2000 or later.  Need
-          to test against a standalone 2k server and see what it 
-          does.  A windows 2000 DC includes its own domain in the 
+          to test against a standalone 2k server and see what it
+          does.  A windows 2000 DC includes its own domain in the
           list.  --jerry */
 
        return status;
 }
 #endif /* JERRY */
+
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_LogonUasLogon(pipes_struct *p,
+                          struct netr_LogonUasLogon *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_LogonUasLogoff(pipes_struct *p,
+                           struct netr_LogonUasLogoff *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_DatabaseDeltas(pipes_struct *p,
+                             struct netr_DatabaseDeltas *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_DatabaseSync(pipes_struct *p,
+                           struct netr_DatabaseSync *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_AccountDeltas(pipes_struct *p,
+                            struct netr_AccountDeltas *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_AccountSync(pipes_struct *p,
+                          struct netr_AccountSync *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_GetDcName(pipes_struct *p,
+                      struct netr_GetDcName *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_GetAnyDCName(pipes_struct *p,
+                         struct netr_GetAnyDCName *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_DatabaseSync2(pipes_struct *p,
+                            struct netr_DatabaseSync2 *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_DatabaseRedo(pipes_struct *p,
+                           struct netr_DatabaseRedo *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+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)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_NETRLOGONDUMMYROUTINE1(pipes_struct *p,
+                                   struct netr_NETRLOGONDUMMYROUTINE1 *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_NETRLOGONSETSERVICEBITS(pipes_struct *p,
+                                    struct netr_NETRLOGONSETSERVICEBITS *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_LogonGetTrustRid(pipes_struct *p,
+                             struct netr_LogonGetTrustRid *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_NETRLOGONCOMPUTESERVERDIGEST(pipes_struct *p,
+                                         struct netr_NETRLOGONCOMPUTESERVERDIGEST *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_NETRLOGONCOMPUTECLIENTDIGEST(pipes_struct *p,
+                                         struct netr_NETRLOGONCOMPUTECLIENTDIGEST *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+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)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_DsRGetSiteName(pipes_struct *p,
+                           struct netr_DsRGetSiteName *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_LogonGetDomainInfo(pipes_struct *p,
+                                 struct netr_LogonGetDomainInfo *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+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)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_NETRLOGONSENDTOSAM(pipes_struct *p,
+                               struct netr_NETRLOGONSENDTOSAM *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_DsRAddressToSitenamesW(pipes_struct *p,
+                                   struct netr_DsRAddressToSitenamesW *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_DsRGetDCNameEx2(pipes_struct *p,
+                            struct netr_DsRGetDCNameEx2 *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(pipes_struct *p,
+                                                struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_NetrEnumerateTrustedDomainsEx(pipes_struct *p,
+                                          struct netr_NetrEnumerateTrustedDomainsEx *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_DsRAddressToSitenamesExW(pipes_struct *p,
+                                     struct netr_DsRAddressToSitenamesExW *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_DsrGetDcSiteCoverageW(pipes_struct *p,
+                                  struct netr_DsrGetDcSiteCoverageW *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_DsrEnumerateDomainTrusts(pipes_struct *p,
+                                     struct netr_DsrEnumerateDomainTrusts *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_DsrDeregisterDNSHostRecords(pipes_struct *p,
+                                        struct netr_DsrDeregisterDNSHostRecords *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_ServerTrustPasswordsGet(pipes_struct *p,
+                                      struct netr_ServerTrustPasswordsGet *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_DsRGetForestTrustInformation(pipes_struct *p,
+                                         struct netr_DsRGetForestTrustInformation *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_GetForestTrustInformation(pipes_struct *p,
+                                      struct netr_GetForestTrustInformation *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+NTSTATUS _netr_LogonSamLogonWithFlags(pipes_struct *p,
+                                     struct netr_LogonSamLogonWithFlags *r)
+{
+       p->rng_fault_state = true;
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR _netr_NETRSERVERGETTRUSTINFO(pipes_struct *p,
+                                   struct netr_NETRSERVERGETTRUSTINFO *r)
+{
+       p->rng_fault_state = true;
+       return WERR_NOT_SUPPORTED;
+}
+