RIP BOOL. Convert BOOL -> bool. I found a few interesting
[nivanova/samba-autobuild/.git] / source3 / rpc_server / srv_netlog_nt.c
index 5ba3dac669a026c57b9ee81bc2f27b8fe97bf604..b651fdaac320e175ff90fc2acfbb9f90316315dd 100644 (file)
@@ -9,7 +9,7 @@
  *
  *  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,
  *  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. */
 
 #include "includes.h"
 
+extern userdom_struct current_user_info;
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
@@ -47,17 +48,12 @@ static void init_net_r_req_chal(NET_R_REQ_CHAL *r_c,
 
 #define ERROR_NO_SUCH_DOMAIN   0x54b
 #define ERROR_NO_LOGON_SERVERS 0x51f
+#define NO_ERROR               0x0
 
 /*************************************************************************
  net_reply_logon_ctrl:
  *************************************************************************/
 
-/* Some flag values reverse engineered from NLTEST.EXE */
-
-#define LOGON_CTRL_IN_SYNC          0x00
-#define LOGON_CTRL_REPL_NEEDED      0x01
-#define LOGON_CTRL_REPL_IN_PROGRESS 0x02
-
 NTSTATUS _net_logon_ctrl(pipes_struct *p, NET_Q_LOGON_CTRL *q_u, 
                       NET_R_LOGON_CTRL *r_u)
 {
@@ -75,24 +71,12 @@ NTSTATUS _net_logon_ctrl(pipes_struct *p, NET_Q_LOGON_CTRL *q_u,
 /****************************************************************************
 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);
 }
 
 /*************************************************************************
@@ -104,25 +88,67 @@ NTSTATUS _net_logon_ctrl2(pipes_struct *p, NET_Q_LOGON_CTRL2 *q_u, NET_R_LOGON_C
         uint32 flags = 0x0;
         uint32 pdc_connection_status = 0x0;
         uint32 logon_attempts = 0x0;
-        uint32 tc_status = ERROR_NO_LOGON_SERVERS;
-        const char *trusted_domain = "test_domain";
-
-        DEBUG(0, ("*** net long ctrl2 %d, %d, %d\n",
-                  q_u->function_code, q_u->query_level, q_u->switch_value));
+        uint32 tc_status;
+       fstring servername, domain, dc_name, dc_name2;
+       struct in_addr dc_ip;
 
-       DEBUG(6,("_net_logon_ctrl2: %d\n", __LINE__));
+       /* this should be \\global_myname() */
+       unistr2_to_ascii(servername, &q_u->uni_server_name, sizeof(servername));
 
-
-       /* set up the Logon Control2 response */
-       init_net_r_logon_ctrl2(r_u, q_u->query_level,
-                              flags, pdc_connection_status, logon_attempts,
-                              tc_status, trusted_domain);
+       r_u->status = NT_STATUS_OK;
+       
+       tc_status = ERROR_NO_SUCH_DOMAIN;
+       fstrcpy( dc_name, "" );
+       
+       switch ( q_u->function_code ) {
+               case NETLOGON_CONTROL_TC_QUERY:
+                       unistr2_to_ascii(domain, &q_u->info.info6.domain, sizeof(domain));
+                               
+                       if ( !is_trusted_domain( domain ) )
+                               break;
+                               
+                       if ( !get_dc_name( domain, NULL, dc_name2, &dc_ip ) ) {
+                               tc_status = ERROR_NO_LOGON_SERVERS;
+                               break;
+                       }
+
+                       fstr_sprintf( dc_name, "\\\\%s", dc_name2 );
+                               
+                       tc_status = NO_ERROR;
+                       
+                       break;
+                       
+               case NETLOGON_CONTROL_REDISCOVER:
+                       unistr2_to_ascii(domain, &q_u->info.info6.domain, sizeof(domain));
+                               
+                       if ( !is_trusted_domain( domain ) )
+                               break;
+                               
+                       if ( !get_dc_name( domain, NULL, dc_name2, &dc_ip ) ) {
+                               tc_status = ERROR_NO_LOGON_SERVERS;
+                               break;
+                       }
+
+                       fstr_sprintf( dc_name, "\\\\%s", dc_name2 );
+                               
+                       tc_status = NO_ERROR;
+                       
+                       break;
+                       
+               default:
+                       /* no idea what this should be */
+                       DEBUG(0,("_net_logon_ctrl2: unimplemented function level [%d]\n",
+                               q_u->function_code));
+       }
+       
+       /* 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)
                 send_sync_message();
 
-       DEBUG(6,("_net_logon_ctrl2: %d\n", __LINE__));
-
        return r_u->status;
 }
 
@@ -164,11 +190,11 @@ static void init_net_r_srv_pwset(NET_R_SRV_PWSET *r_s,
  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, 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
@@ -189,35 +215,79 @@ static BOOL get_md4pw(char *md4pw, char *mach_acct)
        }
 #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;
+       }
+
+       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;
        
-       DEBUG(0,("get_md4pw: Workstation %s: no account in domain\n", mach_acct));
-       pdb_free_sam(&sampass);
-       return False;
 
 }
 
@@ -227,26 +297,33 @@ static BOOL get_md4pw(char *md4pw, char *mach_acct)
 
 NTSTATUS _net_req_chal(pipes_struct *p, NET_Q_REQ_CHAL *q_u, NET_R_REQ_CHAL *r_u)
 {
-       NTSTATUS status = NT_STATUS_OK;
-
-       rpcstr_pull(p->dc.remote_machine,q_u->uni_logon_clnt.buffer,sizeof(fstring),q_u->uni_logon_clnt.uni_str_len*2,0);
-
-       /* create a server challenge for the client */
-       /* Set these to random values. */
-       generate_random_buffer(p->dc.srv_chal.data, 8, False);
-       
-       memcpy(p->dc.srv_cred.challenge.data, p->dc.srv_chal.data, 8);
+       if (!p->dc) {
+               p->dc = TALLOC_ZERO_P(p->pipe_state_mem_ctx, struct dcinfo);
+               if (!p->dc) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+       } else {
+               DEBUG(10,("_net_req_chal: new challenge requested. Clearing old state.\n"));
+               ZERO_STRUCTP(p->dc);
+       }
 
-       memcpy(p->dc.clnt_chal.data          , q_u->clnt_chal.data, sizeof(q_u->clnt_chal.data));
-       memcpy(p->dc.clnt_cred.challenge.data, q_u->clnt_chal.data, sizeof(q_u->clnt_chal.data));
+       rpcstr_pull(p->dc->remote_machine,
+                       q_u->uni_logon_clnt.buffer,
+                       sizeof(fstring),q_u->uni_logon_clnt.uni_str_len*2,0);
 
-       memset((char *)p->dc.sess_key, '\0', sizeof(p->dc.sess_key));
+       /* Save the client challenge to the server. */
+       memcpy(p->dc->clnt_chal.data, q_u->clnt_chal.data, sizeof(q_u->clnt_chal.data));
 
-       p->dc.challenge_sent = True;
+       /* 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, status);
+       init_net_r_req_chal(r_u, &p->dc->srv_chal, NT_STATUS_OK);
        
-       return status;
+       p->dc->challenge_sent = True;
+
+       return NT_STATUS_OK;
 }
 
 /*************************************************************************
@@ -260,50 +337,58 @@ static void init_net_r_auth(NET_R_AUTH *r_a, DOM_CHAL *resp_cred, NTSTATUS statu
 }
 
 /*************************************************************************
- _net_auth
+ _net_auth. Create the initial credentials.
  *************************************************************************/
 
 NTSTATUS _net_auth(pipes_struct *p, NET_Q_AUTH *q_u, NET_R_AUTH *r_u)
 {
-       NTSTATUS status = NT_STATUS_OK;
-       DOM_CHAL srv_cred;
-       UTIME srv_time;
+       NTSTATUS status;
        fstring mach_acct;
+       fstring remote_machine;
+       DOM_CHAL srv_chal_out;
 
-       srv_time.time = 0;
-
-       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);
+       if (!p->dc || !p->dc->challenge_sent) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-       if (p->dc.challenge_sent && get_md4pw((char *)p->dc.md4pw, mach_acct)) {
+       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);
 
-               /* from client / server challenges and md4 password, generate sess key */
-               cred_session_key(&p->dc.clnt_chal, &p->dc.srv_chal,
-                                p->dc.md4pw, p->dc.sess_key);
-               
-               /* check that the client credentials are valid */
-               if (cred_assert(&q_u->clnt_chal, p->dc.sess_key, &p->dc.clnt_cred.challenge, srv_time)) {
-                       
-                       /* create server challenge for inclusion in the reply */
-                       cred_create(p->dc.sess_key, &p->dc.srv_cred.challenge, srv_time, &srv_cred);
-               
-                       /* copy the received client credentials for use next time */
-                       memcpy(p->dc.clnt_cred.challenge.data, q_u->clnt_chal.data, sizeof(q_u->clnt_chal.data));
-                       memcpy(p->dc.srv_cred .challenge.data, q_u->clnt_chal.data, sizeof(q_u->clnt_chal.data));
-                       
-                       /* Save the machine account name. */
-                       fstrcpy(p->dc.mach_acct, mach_acct);
-               
-                       p->dc.authenticated = True;
+       status = get_md4pw((char *)p->dc->mach_pw, mach_acct, q_u->clnt_id.sec_chan);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("_net_auth: creds_server_check failed. Failed to "
+                       "get password for machine account %s "
+                       "from client %s: %s\n",
+                       mach_acct, remote_machine, nt_errstr(status) ));
+               /* always return NT_STATUS_ACCESS_DENIED */
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-               } else {
-                       status = NT_STATUS_ACCESS_DENIED;
-               }
-       } else {
-               status = NT_STATUS_ACCESS_DENIED;
+       /* From the client / server challenges and md4 password, generate sess key */
+       creds_server_init(0,                    /* No neg flags. */
+                       p->dc,
+                       &p->dc->clnt_chal,      /* Stored client chal. */
+                       &p->dc->srv_chal,       /* Stored server chal. */
+                       p->dc->mach_pw,
+                       &srv_chal_out); 
+
+       /* Check client credentials are valid. */
+       if (!creds_server_check(p->dc, &q_u->clnt_chal)) {
+               DEBUG(0,("_net_auth: creds_server_check failed. Rejecting auth "
+                       "request from client %s machine account %s\n",
+                       remote_machine, mach_acct ));
+               return NT_STATUS_ACCESS_DENIED;
        }
-       
+
+       fstrcpy(p->dc->mach_acct, mach_acct);
+       fstrcpy(p->dc->remote_machine, remote_machine);
+       p->dc->authenticated = True;
+
        /* set up the LSA AUTH response */
-       init_net_r_auth(r_u, &srv_cred, status);
+       /* Return the server credentials. */
+       init_net_r_auth(r_u, &srv_chal_out, NT_STATUS_OK);
 
        return r_u->status;
 }
@@ -326,51 +411,60 @@ static void init_net_r_auth_2(NET_R_AUTH_2 *r_a,
 
 NTSTATUS _net_auth_2(pipes_struct *p, NET_Q_AUTH_2 *q_u, NET_R_AUTH_2 *r_u)
 {
-       NTSTATUS status = NT_STATUS_OK;
-       DOM_CHAL srv_cred;
-       UTIME srv_time;
+       NTSTATUS status;
        NEG_FLAGS srv_flgs;
        fstring mach_acct;
+       fstring remote_machine;
+       DOM_CHAL 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);
+
+       /* We use this as the key to store the creds. */
+       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);
 
-       srv_time.time = 0;
+       if (!p->dc || !p->dc->challenge_sent) {
+               DEBUG(0,("_net_auth2: no challenge sent to client %s\n",
+                       remote_machine ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
        if ( (lp_server_schannel() == True) &&
             ((q_u->clnt_flgs.neg_flags & NETLOGON_NEG_SCHANNEL) == 0) ) {
 
                /* schannel must be used, but client did not offer it. */
-               status = NT_STATUS_ACCESS_DENIED;
+               DEBUG(0,("_net_auth2: schannel required but client failed "
+                       "to offer it. Client was %s\n",
+                       mach_acct ));
+               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);
-
-       if (p->dc.challenge_sent && get_md4pw((char *)p->dc.md4pw, mach_acct)) {
-               
-               /* from client / server challenges and md4 password, generate sess key */
-               cred_session_key(&p->dc.clnt_chal, &p->dc.srv_chal,
-                                p->dc.md4pw, p->dc.sess_key);
-               
-               /* check that the client credentials are valid */
-               if (cred_assert(&q_u->clnt_chal, p->dc.sess_key, &p->dc.clnt_cred.challenge, srv_time)) {
-                       
-                       /* create server challenge for inclusion in the reply */
-                       cred_create(p->dc.sess_key, &p->dc.srv_cred.challenge, srv_time, &srv_cred);
-                       
-                       /* copy the received client credentials for use next time */
-                       memcpy(p->dc.clnt_cred.challenge.data, q_u->clnt_chal.data, sizeof(q_u->clnt_chal.data));
-                       memcpy(p->dc.srv_cred .challenge.data, q_u->clnt_chal.data, sizeof(q_u->clnt_chal.data));
-                       
-                       /* Save the machine account name. */
-                       fstrcpy(p->dc.mach_acct, mach_acct);
-                       
-                       p->dc.authenticated = True;
+       status = get_md4pw((char *)p->dc->mach_pw, mach_acct, q_u->clnt_id.sec_chan);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("_net_auth2: failed to get machine password for "
+                       "account %s: %s\n",
+                       mach_acct, nt_errstr(status) ));
+               /* always return NT_STATUS_ACCESS_DENIED */
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-               } else {
-                       status = NT_STATUS_ACCESS_DENIED;
-               }
-       } else {
-               status = NT_STATUS_ACCESS_DENIED;
+       /* From the client / server challenges and md4 password, generate sess key */
+       creds_server_init(q_u->clnt_flgs.neg_flags,
+                       p->dc,
+                       &p->dc->clnt_chal,      /* Stored client chal. */
+                       &p->dc->srv_chal,       /* Stored server chal. */
+                       p->dc->mach_pw,
+                       &srv_chal_out); 
+
+       /* Check client credentials are valid. */
+       if (!creds_server_check(p->dc, &q_u->clnt_chal)) {
+               DEBUG(0,("_net_auth2: creds_server_check failed. Rejecting auth "
+                       "request from client %s machine account %s\n",
+                       remote_machine, mach_acct ));
+               return NT_STATUS_ACCESS_DENIED;
        }
-       
+
        srv_flgs.neg_flags = 0x000001ff;
 
        if (lp_server_schannel() != False) {
@@ -378,12 +472,20 @@ NTSTATUS _net_auth_2(pipes_struct *p, NET_Q_AUTH_2 *q_u, NET_R_AUTH_2 *r_u)
        }
 
        /* set up the LSA AUTH 2 response */
-       init_net_r_auth_2(r_u, &srv_cred, &srv_flgs, status);
+       init_net_r_auth_2(r_u, &srv_chal_out, &srv_flgs, NT_STATUS_OK);
 
-       if (NT_STATUS_IS_OK(status)) {
-               extern struct dcinfo last_dcinfo;
-               last_dcinfo = p->dc;
-       }
+       fstrcpy(p->dc->mach_acct, mach_acct);
+       fstrcpy(p->dc->remote_machine, remote_machine);
+       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,
+                                       remote_machine,
+                                       p->dc);
+       unbecome_root();
 
        return r_u->status;
 }
@@ -394,172 +496,326 @@ NTSTATUS _net_auth_2(pipes_struct *p, NET_Q_AUTH_2 *q_u, NET_R_AUTH_2 *r_u)
 
 NTSTATUS _net_srv_pwset(pipes_struct *p, NET_Q_SRV_PWSET *q_u, NET_R_SRV_PWSET *r_u)
 {
-       NTSTATUS status = NT_STATUS_ACCESS_DENIED;
-       DOM_CRED srv_cred;
-       pstring workstation;
-       SAM_ACCOUNT *sampass=NULL;
-       BOOL ret = False;
+       fstring remote_machine;
+       struct samu *sampass=NULL;
+       bool ret = False;
        unsigned char pwd[16];
        int i;
        uint32 acct_ctrl;
+       DOM_CRED cred_out;
+       const uchar *old_pw;
 
-       /* checks and updates credentials.  creates reply credentials */
-       if (!(p->dc.authenticated && deal_with_creds(p->dc.sess_key, &p->dc.clnt_cred, &q_u->clnt_id.cred, &srv_cred)))
-               return NT_STATUS_INVALID_HANDLE;
+       DEBUG(5,("_net_srv_pwset: %d\n", __LINE__));
 
-       memcpy(&p->dc.srv_cred, &p->dc.clnt_cred, sizeof(p->dc.clnt_cred));
+       /* We need the remote machine name for the creds lookup. */
+       rpcstr_pull(remote_machine,q_u->clnt_id.login.uni_comp_name.buffer,
+                   sizeof(remote_machine),q_u->clnt_id.login.uni_comp_name.uni_str_len*2,0);
 
-       DEBUG(5,("_net_srv_pwset: %d\n", __LINE__));
+       if ( (lp_server_schannel() == True) && (p->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) ) {
+               /* 'server schannel = yes' should enforce use of
+                  schannel, the client did offer it in auth2, but
+                  obviously did not use it. */
+               DEBUG(0,("_net_srv_pwset: 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->pipe_state_mem_ctx,
+                                                       remote_machine,
+                                                       &p->dc);
+               unbecome_root();
+               if (!ret) {
+                       return NT_STATUS_INVALID_HANDLE;
+               }
+       }
 
-       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);
+       if (!p->dc || !p->dc->authenticated) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
 
-       DEBUG(3,("Server Password Set by Wksta:[%s] on account [%s]\n", workstation, p->dc.mach_acct));
+       DEBUG(3,("_net_srv_pwset: Server Password Set by remote machine:[%s] on account [%s]\n",
+                       remote_machine, p->dc->mach_acct));
        
-       pdb_init_sam(&sampass);
+       /* Step the creds chain forward. */
+       if (!creds_server_step(p->dc, &q_u->clnt_id.cred, &cred_out)) {
+               DEBUG(2,("_net_srv_pwset: 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. */
+       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->pipe_state_mem_ctx,
+                                               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);
+
        DEBUG(100,("Server password set : new given value was :\n"));
-       for(i = 0; i < 16; i++)
-               DEBUG(100,("%02X ", q_u->pwd[i]));
+       for(i = 0; i < sizeof(pwd); i++)
+               DEBUG(100,("%02X ", pwd[i]));
        DEBUG(100,("\n"));
 
-       cred_hash3( pwd, q_u->pwd, p->dc.sess_key, 0);
+       old_pw = pdb_get_nt_passwd(sampass);
 
-       /* lies!  nt and lm passwords are _not_ the same: don't care */
-       if (!pdb_set_lanman_passwd (sampass, pwd, PDB_CHANGED)) {
-               pdb_free_sam(&sampass);
-               return NT_STATUS_NO_MEMORY;
-       }
+       if (old_pw && memcmp(pwd, old_pw, 16) == 0) {
+               /* Avoid backend modificiations and other fun if the 
+                  client changed the password to the *same thing* */
 
-       if (!pdb_set_nt_passwd     (sampass, pwd, PDB_CHANGED)) {
-               pdb_free_sam(&sampass);
-               return NT_STATUS_NO_MEMORY;
-       }
+               ret = True;
+       } else {
 
-       if (!pdb_set_pass_changed_now     (sampass)) {
-               pdb_free_sam(&sampass);
-               /* Not quite sure what this one qualifies as, but this will do */
-               return NT_STATUS_UNSUCCESSFUL; 
+               /* LM password should be NULL for machines */
+               if (!pdb_set_lanman_passwd(sampass, NULL, PDB_CHANGED)) {
+                       TALLOC_FREE(sampass);
+                       return NT_STATUS_NO_MEMORY;
+               }
+               
+               if (!pdb_set_nt_passwd(sampass, pwd, PDB_CHANGED)) {
+                       TALLOC_FREE(sampass);
+                       return NT_STATUS_NO_MEMORY;
+               }
+               
+               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; 
+               }
+               
+               become_root();
+               r_u->status = pdb_update_sam_account(sampass);
+               unbecome_root();
        }
-       become_root();
-       ret = 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, &srv_cred, status);
+       init_net_r_srv_pwset(r_u, &cred_out, r_u->status);
 
-       pdb_free_sam(&sampass);
+       TALLOC_FREE(sampass);
        return r_u->status;
 }
 
-
 /*************************************************************************
  _net_sam_logoff:
  *************************************************************************/
 
 NTSTATUS _net_sam_logoff(pipes_struct *p, NET_Q_SAM_LOGOFF *q_u, NET_R_SAM_LOGOFF *r_u)
 {
-       DOM_CRED srv_cred;
+       fstring remote_machine;
+
+       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",
+                       get_remote_machine_name() ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
 
        if (!get_valid_user_struct(p->vuid))
                return NT_STATUS_NO_SUCH_USER;
 
-       /* checks and updates credentials.  creates reply credentials */
-       if (!(p->dc.authenticated && deal_with_creds(p->dc.sess_key, &p->dc.clnt_cred, 
-                                                    &q_u->sam_id.client.cred, &srv_cred)))
-               return NT_STATUS_INVALID_HANDLE;
+       /* Get the remote machine name for the creds store. */
+       rpcstr_pull(remote_machine,q_u->sam_id.client.login.uni_comp_name.buffer,
+                   sizeof(remote_machine),q_u->sam_id.client.login.uni_comp_name.uni_str_len*2,0);
+
+       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);
+               unbecome_root();
+               if (!ret) {
+                       return NT_STATUS_INVALID_HANDLE;
+               }
+       }
 
-       memcpy(&p->dc.srv_cred, &p->dc.clnt_cred, sizeof(p->dc.clnt_cred));
+       if (!p->dc || !p->dc->authenticated) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
 
-       /* XXXX maybe we want to say 'no', reject the client's credentials */
        r_u->buffer_creds = 1; /* yes, we have valid server credentials */
-       memcpy(&r_u->srv_creds, &srv_cred, sizeof(r_u->srv_creds));
 
-       r_u->status = NT_STATUS_OK;
+       /* checks and updates credentials.  creates reply credentials */
+       if (!creds_server_step(p->dc, &q_u->sam_id.client.cred, &r_u->srv_creds)) {
+               DEBUG(2,("_net_sam_logoff: 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->pipe_state_mem_ctx,
+                                       remote_machine,
+                                       p->dc);
+       unbecome_root();
 
+       r_u->status = NT_STATUS_OK;
        return r_u->status;
 }
 
+/*******************************************************************
+ 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;
+}
 
 /*************************************************************************
  _net_sam_logon
  *************************************************************************/
 
-NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *r_u)
+static NTSTATUS _net_sam_logon_internal(pipes_struct *p,
+                                       NET_Q_SAM_LOGON *q_u,
+                                       NET_R_SAM_LOGON *r_u,
+                                       bool process_creds)
 {
        NTSTATUS status = NT_STATUS_OK;
        NET_USER_INFO_3 *usr_info = NULL;
        NET_ID_INFO_CTR *ctr = q_u->sam_id.ctr;
-       DOM_CRED srv_cred;
        UNISTR2 *uni_samlogon_user = NULL;
        UNISTR2 *uni_samlogon_domain = NULL;
        UNISTR2 *uni_samlogon_workstation = NULL;
        fstring nt_username, nt_domain, nt_workstation;
        auth_usersupplied_info *user_info = NULL;
        auth_serversupplied_info *server_info = NULL;
-       extern userdom_struct current_user_info;
-       SAM_ACCOUNT *sampw;
+       struct samu *sampw;
        struct auth_context *auth_context = NULL;
-               
-       usr_info = (NET_USER_INFO_3 *)talloc(p->mem_ctx, sizeof(NET_USER_INFO_3));
-       if (!usr_info)
+        
+       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_logon_internal: client %s not using schannel for netlogon\n",
+                       get_remote_machine_name() ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       usr_info = TALLOC_P(p->mem_ctx, NET_USER_INFO_3);
+       if (!usr_info) {
                return NT_STATUS_NO_MEMORY;
+       }
 
        ZERO_STRUCTP(usr_info);
 
        /* 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 */
+       if (q_u->validation_level != 2 && q_u->validation_level != 3) {
+               DEBUG(0,("_net_sam_logon: bad validation_level value %d.\n", (int)q_u->validation_level ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+       /* We handle the return of USER_INFO_2 instead of 3 in the parse return. Sucks, I know... */
+       r_u->switch_value = q_u->validation_level; /* 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 (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.
+               */
+               rpcstr_pull(remote_machine,q_u->sam_id.client.login.uni_comp_name.buffer,
+                   sizeof(remote_machine),q_u->sam_id.client.login.uni_comp_name.uni_str_len*2,0);
+
+               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);
+                       unbecome_root();
+                       if (!ret) {
+                               return NT_STATUS_INVALID_HANDLE;
+                       }
+               }
 
-       if ( (lp_server_schannel() == True) && (!p->netsec_auth_validated) ) {
-               /* 'server schannel = yes' should enforce use of
-                  schannel, the client did offer it in auth2, but
-                  obviously did not use it. */
-               return NT_STATUS_ACCESS_DENIED;
-       }
+               if (!p->dc || !p->dc->authenticated) {
+                       return NT_STATUS_INVALID_HANDLE;
+               }
 
-       /* checks and updates credentials.  creates reply credentials */
-       if (!(p->dc.authenticated && deal_with_creds(p->dc.sess_key, &p->dc.clnt_cred, &q_u->sam_id.client.cred, &srv_cred)))
-               return NT_STATUS_INVALID_HANDLE;
+               /* checks and updates credentials.  creates reply credentials */
+               if (!creds_server_step(p->dc, &q_u->sam_id.client.cred,  &r_u->srv_creds)) {
+                       DEBUG(2,("_net_sam_logon: 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;
+               }
 
-       memcpy(&p->dc.srv_cred, &p->dc.clnt_cred, sizeof(p->dc.clnt_cred));
-    
-       r_u->buffer_creds = 1; /* yes, we have valid server credentials */
-       memcpy(&r_u->srv_creds, &srv_cred, sizeof(r_u->srv_creds));
+               /* 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);
+               unbecome_root();
+       }
 
-       /* find the username */
-    
        switch (q_u->sam_id.logon_level) {
        case INTERACTIVE_LOGON_TYPE:
                uni_samlogon_user = &ctr->auth.id1.uni_user_name;
@@ -585,9 +841,7 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
        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);
      
@@ -598,14 +852,23 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
        switch (ctr->switch_value) {
        case NET_LOGON_TYPE:
        {
+               const char *wksname = nt_workstation;
+               
                if (!NT_STATUS_IS_OK(status = make_auth_context_fixed(&auth_context, ctr->auth.id2.lm_chal))) {
                        return status;
                }
 
+               /* For a network logon, the workstation name comes in with two
+                * backslashes in the front. Strip them if they are there. */
+
+               if (*wksname == '\\') wksname++;
+               if (*wksname == '\\') wksname++;
+
                /* Standard challenge/response authenticaion */
                if (!make_user_info_netlogon_network(&user_info, 
                                                     nt_username, nt_domain, 
-                                                    nt_workstation, 
+                                                    wksname,
+                                                    ctr->auth.id2.param_ctrl,
                                                     ctr->auth.id2.lm_chal_resp.buffer,
                                                     ctr->auth.id2.lm_chal_resp.str_str_len,
                                                     ctr->auth.id2.nt_chal_resp.buffer,
@@ -615,10 +878,10 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                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 */
+               /* '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;
                
@@ -630,10 +893,12 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
 
                if (!make_user_info_netlogon_interactive(&user_info, 
                                                         nt_username, nt_domain, 
-                                                        nt_workstation, chal,
+                                                        nt_workstation, 
+                                                        ctr->auth.id1.param_ctrl,
+                                                        chal,
                                                         ctr->auth.id1.lm_owf.data, 
                                                         ctr->auth.id1.nt_owf.data, 
-                                                        p->dc.sess_key)) {
+                                                        p->dc->sess_key)) {
                        status = NT_STATUS_NO_MEMORY;
                }
                break;
@@ -657,14 +922,24 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
        /* Check account and password */
     
        if (!NT_STATUS_IS_OK(status)) {
-               free_server_info(&server_info);
+               /* 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) 
+                    && !strequal(nt_domain, get_global_sam_name())
+                    && !is_trusted_domain(nt_domain) )
+                       r_u->auth_resp = 0; /* We are not authoritative */
+
+               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,("_net_sam_logon: Attempted domain logon as GUEST "
+                        "denied.\n"));
+               TALLOC_FREE(server_info);
                return NT_STATUS_LOGON_FAILURE;
        }
 
@@ -683,45 +958,92 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                pstring my_name;
                fstring user_sid_string;
                fstring group_sid_string;
-               uchar user_sess_key[16];
-               uchar netlogon_sess_key[16];
+               unsigned char user_session_key[16];
+               unsigned char lm_session_key[16];
+               unsigned char pipe_session_key[16];
 
                sampw = server_info->sam_account;
 
-               /* set up pointer indicating user/password failed to be found */
+               /* 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);
 
+               if ((user_sid == NULL) || (group_sid == NULL)) {
+                       DEBUG(1, ("_net_sam_logon: User without group or user SID\n"));
+                       return NT_STATUS_UNSUCCESSFUL;
+               }
+
                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),
+                       DEBUG(1, ("_net_sam_logon: 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_to_string(user_sid_string, user_sid),
                                  sid_to_string(group_sid_string, group_sid)));
                        return NT_STATUS_UNSUCCESSFUL;
                }
                
-               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;
+               
+               if(server_info->login_server) {
+                       pstrcpy(my_name, server_info->login_server);
+               } else {
+                       pstrcpy(my_name, global_myname());
                }
 
-               ZERO_STRUCT(netlogon_sess_key);
-               memcpy(netlogon_sess_key, p->dc.sess_key, 8);
-               memcpy(user_sess_key, server_info->session_key, sizeof(user_sess_key));
-               SamOEMhash(user_sess_key, netlogon_sess_key, 16);
-               ZERO_STRUCT(netlogon_sess_key);
+               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,
+                              server_info->user_session_key.data, 
+                              MIN(sizeof(user_session_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, pipe_session_key, 16);
+                       memset(pipe_session_key, '\0', 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));
+                       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, pipe_session_key, 16);
+                       memset(pipe_session_key, '\0', 16);
+               }
+               
                init_net_user_info3(p->mem_ctx, usr_info, 
                                    user_rid,
                                    group_rid,   
@@ -737,37 +1059,89 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                                    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 (?) */
-                                   user_sess_key,
+                                   LOGON_EXTRA_SIDS, /* uint32 user_flgs (?) */
+                                   pdb_get_acct_ctrl(sampw),
+                                   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_sess_key);
+                                   &domain_sid);     /* DOM_SID *dom_sid */  
+               ZERO_STRUCT(user_session_key);
+               ZERO_STRUCT(lm_session_key);
        }
-       free_server_info(&server_info);
+       TALLOC_FREE(server_info);
        return status;
 }
 
+/*************************************************************************
+ _net_sam_logon
+ *************************************************************************/
+
+NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *r_u)
+{
+       return _net_sam_logon_internal(p, q_u, r_u, True);
+}
+/*************************************************************************
+ _net_sam_logon_ex - no credential chaining. Map into net sam logon.
+ *************************************************************************/
+
+NTSTATUS _net_sam_logon_ex(pipes_struct *p, NET_Q_SAM_LOGON_EX *q_u, NET_R_SAM_LOGON_EX *r_u)
+{
+       NET_Q_SAM_LOGON q;
+       NET_R_SAM_LOGON r;
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* 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;
+        }
+
+       /* Map a NET_Q_SAM_LOGON_EX to NET_Q_SAM_LOGON. */
+       q.validation_level = q_u->validation_level;
+
+       /* Map a DOM_SAM_INFO_EX into a DOM_SAM_INFO with no creds. */
+       q.sam_id.client.login = q_u->sam_id.client;
+       q.sam_id.logon_level = q_u->sam_id.logon_level;
+       q.sam_id.ctr = q_u->sam_id.ctr;
+
+       r_u->status = _net_sam_logon_internal(p, &q, &r, False);
+
+       if (!NT_STATUS_IS_OK(r_u->status)) {
+               return r_u->status;
+       }
+
+       /* Map the NET_R_SAM_LOGON to NET_R_SAM_LOGON_EX. */
+       r_u->switch_value = r.switch_value;
+       r_u->user = r.user;
+       r_u->auth_resp = r.auth_resp;
+       r_u->flags = 0; /* FIXME ! */
+       return r_u->status;
+}
+
 /*************************************************************************
  _ds_enum_dom_trusts
  *************************************************************************/
+#if 0  /* JERRY -- not correct */
 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;
 
-       /* We just return zero trusts for now. At least that way we're
-          consistent with NetTrustedDomainList which is what the fallback
-          for this function is. Both of these functions need to be
-          reworked. */
+       /* 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 
+          list.  --jerry */
 
        return status;
 }
+#endif /* JERRY */