r11617: fix typo
[kai/samba-autobuild/.git] / source / rpc_server / srv_netlog_nt.c
index 8070cdd9841755a53d1bda5baa084af1bf3f1fc1..7903adff6d59a91185ae4f26371565a7d3f4de5b 100644 (file)
@@ -5,7 +5,7 @@
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
  *  Copyright (C) Paul Ashton                       1997.
  *  Copyright (C) Jeremy Allison               1998-2001.
- *  Copyirht  (C) Andrew Bartlett                   2001.
+ *  Copyright (C) Andrew Bartlett                   2001.
  *
  *  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
@@ -26,6 +26,8 @@
 
 #include "includes.h"
 
+extern userdom_struct current_user_info;
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
@@ -47,17 +49,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,6 +72,7 @@ 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;
@@ -104,25 +102,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;
 }
 
@@ -227,26 +267,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 +307,54 @@ 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;
        fstring mach_acct;
+       fstring remote_machine;
+       DOM_CHAL srv_chal_out;
 
-       srv_time.time = 0;
+       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(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 ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-       if (p->dc.challenge_sent && get_md4pw((char *)p->dc.md4pw, mach_acct)) {
+       /* From the client / server challenges and md4 password, generate sess key */
+       creds_server_init(p->dc,
+                       &p->dc->clnt_chal,      /* Stored client chal. */
+                       &p->dc->srv_chal,       /* Stored server chal. */
+                       (const char *)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;
+       }
 
-               /* 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;
+       fstrcpy(p->dc->mach_acct, mach_acct);
+       fstrcpy(p->dc->remote_machine, remote_machine);
+       p->dc->authenticated = True;
 
-               } else {
-                       status = NT_STATUS_ACCESS_DENIED;
-               }
-       } else {
-               status = NT_STATUS_ACCESS_DENIED;
-       }
-       
        /* 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,48 +377,73 @@ 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;
        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);
+       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 (!p->dc || !p->dc->challenge_sent) {
+               DEBUG(0,("_net_auth2: no challenge sent to client %s\n",
+                       remote_machine ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-       srv_time.time = 0;
+       if ( (lp_server_schannel() == True) &&
+            ((q_u->clnt_flgs.neg_flags & NETLOGON_NEG_SCHANNEL) == 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);
+               /* schannel must be used, but client did not offer it. */
+               DEBUG(0,("_net_auth2: schannel required but client failed "
+                       "to offer it. Client was %s\n",
+                       mach_acct ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-       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;
+       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 ));
+               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(p->dc,
+                       &p->dc->clnt_chal,      /* Stored client chal. */
+                       &p->dc->srv_chal,       /* Stored server chal. */
+                       (const char *)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) {
+               srv_flgs.neg_flags |= NETLOGON_NEG_SCHANNEL;
+       }
+
        /* 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);
+
+       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, p->dc);
+       unbecome_root();
 
        return r_u->status;
 }
@@ -379,31 +455,39 @@ 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;
+       fstring workstation;
        SAM_ACCOUNT *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)))
+       if (!p->dc || !p->dc->authenticated) {
                return NT_STATUS_INVALID_HANDLE;
+       }
 
-       memcpy(&p->dc.srv_cred, &p->dc.clnt_cred, sizeof(p->dc.clnt_cred));
+       /* 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 "
+                       "request from client %s machine account %s\n",
+                       p->dc->remote_machine, p->dc->mach_acct ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
        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,("Server Password Set by Wksta:[%s] on account [%s]\n", workstation, p->dc.mach_acct));
+       DEBUG(3,("_net_srv_pwset: Server Password Set by Wksta:[%s] on account [%s]\n",
+                       workstation, p->dc->mach_acct));
        
        pdb_init_sam(&sampass);
 
        become_root();
-       ret=pdb_getsampwnam(sampass, p->dc.mach_acct);
+       ret=pdb_getsampwnam(sampass, p->dc->mach_acct);
        unbecome_root();
 
        /* Ensure the account exists and is a machine account. */
@@ -423,69 +507,79 @@ NTSTATUS _net_srv_pwset(pipes_struct *p, NET_Q_SRV_PWSET *q_u, NET_R_SRV_PWSET *
                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)) {
+                       pdb_free_sam(&sampass);
+                       return NT_STATUS_NO_MEMORY;
+               }
+               
+               if (!pdb_set_nt_passwd(sampass, pwd, PDB_CHANGED)) {
+                       pdb_free_sam(&sampass);
+                       return NT_STATUS_NO_MEMORY;
+               }
+               
+               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; 
+               }
+               
+               become_root();
+               ret = pdb_update_sam_account (sampass);
+               unbecome_root();
        }
-       become_root();
-       ret = pdb_update_sam_account (sampass);
-       unbecome_root();
-       if (ret)
+       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, status);
 
        pdb_free_sam(&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;
-
        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)))
+       if (!p->dc || !p->dc->authenticated) {
                return NT_STATUS_INVALID_HANDLE;
+       }
 
-       memcpy(&p->dc.srv_cred, &p->dc.clnt_cred, sizeof(p->dc.clnt_cred));
-
-       /* 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(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 ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
+       r_u->status = NT_STATUS_OK;
        return r_u->status;
 }
 
@@ -499,17 +593,16 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
        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 auth_context *auth_context = NULL;
                
-       usr_info = (NET_USER_INFO_3 *)talloc(p->mem_ctx, sizeof(NET_USER_INFO_3));
+       usr_info = TALLOC_P(p->mem_ctx, NET_USER_INFO_3);
        if (!usr_info)
                return NT_STATUS_NO_MEMORY;
 
@@ -520,18 +613,31 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
        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;
-    
-       /* 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)))
+
+       if (!p->dc || !p->dc->authenticated) {
                return NT_STATUS_INVALID_HANDLE;
+       }
 
-       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));
+       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 ));
+               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_logon: 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;
+       }
 
        /* find the username */
     
@@ -556,8 +662,6 @@ 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 */
 
-       /* check username exists */
-
        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);
@@ -568,34 +672,36 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
        fstrcpy(current_user_info.smb_name, nt_username);
        sub_set_smb_name(nt_username);
      
-       /*
-        * Convert to a UNIX username.
-        */
-
        DEBUG(5,("Attempting validation level %d for unmapped username %s.\n", q_u->sam_id.ctr->switch_value, nt_username));
 
+       status = NT_STATUS_OK;
+       
        switch (ctr->switch_value) {
        case NET_LOGON_TYPE:
        {
-               struct auth_context *auth_context = NULL;
+               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,
                                                     ctr->auth.id2.nt_chal_resp.str_str_len)) {
                        status = NT_STATUS_NO_MEMORY;
-               } else {
-                       status = auth_context->check_ntlm_password(auth_context, user_info, &server_info);
-               }
-               (auth_context->free)(&auth_context);
-                       
+               }       
                break;
        }
        case INTERACTIVE_LOGON_TYPE:
@@ -604,8 +710,8 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                   convert this to chellange/responce for the auth
                   subsystem to chew on */
        {
-               struct auth_context *auth_context = NULL;
                const uint8 *chal;
+               
                if (!NT_STATUS_IS_OK(status = make_auth_context_subsystem(&auth_context))) {
                        return status;
                }
@@ -614,17 +720,14 @@ 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;
-               } else {
-                       status = auth_context->check_ntlm_password(auth_context, user_info, &server_info);
                }
-
-               (auth_context->free)(&auth_context);
-
                break;
        }
        default:
@@ -632,6 +735,12 @@ 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 */
        
+       if ( NT_STATUS_IS_OK(status) ) {
+               status = auth_context->check_ntlm_password(auth_context, 
+                       user_info, &server_info);
+       }
+
+       (auth_context->free)(&auth_context);    
        free_user_info(&user_info);
        
        DEBUG(5, ("_net_sam_logon: check_password returned status %s\n", 
@@ -640,6 +749,15 @@ 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)) {
+               /* 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 */
+
                free_server_info(&server_info);
                return status;
        }
@@ -666,9 +784,10 @@ 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 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 */
@@ -688,8 +807,13 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                        return NT_STATUS_UNSUCCESSFUL;
                }
                
-               pstrcpy(my_name, global_myname());
-
+               
+               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, 
@@ -700,15 +824,22 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                }
 
                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);
+               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);
+               }
                ZERO_STRUCT(netlogon_sess_key);
-
+               
                init_net_user_info3(p->mem_ctx, usr_info, 
                                    user_rid,
-                                   group_rid,
-                                   
+                                   group_rid,   
                                    pdb_get_username(sampw),
                                    pdb_get_fullname(sampw),
                                    pdb_get_homedir(sampw),
@@ -727,17 +858,36 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
                                    num_gids,    /* uint32 num_groups */
                                    gids    , /* DOM_GID *gids */
                                    0x20    , /* uint32 user_flgs (?) */
-                                   user_sess_key,
+                                   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);
+               ZERO_STRUCT(user_session_key);
+               ZERO_STRUCT(lm_session_key);
        }
        free_server_info(&server_info);
        return 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;
+
+       /* 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 */