Fix some uninitialized data in new netlogon client.
[gd/samba/.git] / source / rpc_client / cli_netlogon.c
index 90c8a34c21d216bd4f3c709a975dc6d63ed5b4b3..91e27c5d85be0e58b74ebbe4807fe86ac95d6124 100644 (file)
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997.
- *  Copyright (C) Jeremy Allison                    1998.
- *
- *  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
- *  (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.
- */
-
+/*
+   Unix SMB/CIFS implementation.
+   NT Domain Authentication SMB / MSRPC client
+   Copyright (C) Andrew Tridgell 1992-2000
+   Copyright (C) Jeremy Allison                    1998.
+   Largely re-written by Jeremy Allison (C)       2005.
+
+   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 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, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "includes.h"
 
-extern pstring global_myname;
-extern fstring global_myworkgroup;
+/* LSA Request Challenge. Sends our challenge to server, then gets
+   server response. These are used to generate the credentials.
+ The sent and received challenges are stored in the netlog pipe
+ private data. Only call this via rpccli_netlogon_setup_creds(). JRA.
+*/
 
+/* instead of rpccli_net_req_chal() we use rpccli_netr_ServerReqChallenge() now - gd */
+
+#if 0
 /****************************************************************************
-Generate the next creds to use.
+LSA Authenticate 2
+
+Send the client credential, receive back a server credential.
+Ensure that the server credential returned matches the session key
+encrypt of the server challenge originally received. JRA.
 ****************************************************************************/
 
-static void gen_next_creds( struct cli_state *cli, DOM_CRED *new_clnt_cred)
+  NTSTATUS rpccli_net_auth2(struct rpc_pipe_client *cli,
+                      uint16 sec_chan,
+                      uint32 *neg_flags, DOM_CHAL *srv_chal)
 {
-  /*
-   * Create the new client credentials.
-   */
+        prs_struct qbuf, rbuf;
+        NET_Q_AUTH_2 q;
+        NET_R_AUTH_2 r;
+        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       fstring machine_acct;
+
+       if ( sec_chan == SEC_CHAN_DOMAIN )
+               fstr_sprintf( machine_acct, "%s$", lp_workgroup() );
+       else
+               fstrcpy( machine_acct, cli->mach_acct );
+
+        /* create and send a MSRPC command with api NET_AUTH2 */
+
+        DEBUG(4,("cli_net_auth2: srv:%s acct:%s sc:%x mc: %s chal %s neg: %x\n",
+                 cli->srv_name_slash, machine_acct, sec_chan, global_myname(),
+                 credstr(cli->clnt_cred.challenge.data), *neg_flags));
+
+        /* store the parameters */
+
+        init_q_auth_2(&q, cli->srv_name_slash, machine_acct,
+                      sec_chan, global_myname(), &cli->clnt_cred.challenge,
+                      *neg_flags);
+
+        /* turn parameters into data stream */
+
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_AUTH2,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_auth_2,
+               net_io_r_auth_2,
+               NT_STATUS_UNSUCCESSFUL);
+
+        result = r.status;
+
+        if (NT_STATUS_IS_OK(result)) {
+                UTIME zerotime;
+
+                /*
+                 * Check the returned value using the initial
+                 * server received challenge.
+                 */
+
+                zerotime.time = 0;
+                if (cred_assert( &r.srv_chal, cli->sess_key, srv_chal, zerotime) == 0) {
+
+                        /*
+                         * Server replied with bad credential. Fail.
+                         */
+                        DEBUG(0,("cli_net_auth2: server %s replied with bad credential (bad machine \
+password ?).\n", cli->cli->desthost ));
+                       return NT_STATUS_ACCESS_DENIED;
+                }
+               *neg_flags = r.srv_flgs.neg_flags;
+        }
+
+        return result;
+}
+#endif
 
-  cli->clnt_cred.timestamp.time = time(NULL);
+/****************************************************************************
+ LSA Authenticate 2
 
-  memcpy(new_clnt_cred, &cli->clnt_cred, sizeof(*new_clnt_cred));
+ Send the client credential, receive back a server credential.
+ The caller *must* ensure that the server credential returned matches the session key
+ encrypt of the server challenge originally received. JRA.
+****************************************************************************/
 
-  /* Calculate the new credentials. */
-  cred_create(cli->sess_key, &(cli->clnt_cred.challenge),
-              new_clnt_cred->timestamp, &(new_clnt_cred->challenge));
+/* instead of rpccli_net_auth2() we use rpccli_netr_ServerAuthenticate2() now -  gd */
 
-}
 
-#if UNUSED_CODE
 /****************************************************************************
-do a LSA Logon Control2
+ Wrapper function that uses the auth and auth2 calls to set up a NETLOGON
+ credentials chain. Stores the credentials in the struct dcinfo in the
+ netlogon pipe struct.
 ****************************************************************************/
-BOOL cli_net_logon_ctrl2(struct cli_state *cli, NTSTATUS status_level)
+
+NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
+                                    const char *server_name,
+                                    const char *domain,
+                                    const char *clnt_name,
+                                    const char *machine_account,
+                                    const unsigned char machine_pwd[16],
+                                    enum netr_SchannelType sec_chan_type,
+                                    uint32_t *neg_flags_inout)
 {
-  prs_struct rbuf;
-  prs_struct buf; 
-  NET_Q_LOGON_CTRL2 q_l;
-  BOOL ok = False;
-
-  prs_init(&buf , 1024, cli->mem_ctx, MARSHALL);
-  prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
-
-  /* create and send a MSRPC command with api NET_LOGON_CTRL2 */
-
-  DEBUG(4,("do_net_logon_ctrl2 from %s status level:%x\n",
-           global_myname, status_level));
-
-  /* store the parameters */
-  init_q_logon_ctrl2(&q_l, cli->srv_name_slash, 
-                    status_level);
-
-  /* turn parameters into data stream */
-  if(!net_io_q_logon_ctrl2("", &q_l,  &buf, 0)) {
-    DEBUG(0,("cli_net_logon_ctrl2: Error : failed to marshall NET_Q_LOGON_CTRL2 struct.\n"));
-    prs_mem_free(&buf);
-    prs_mem_free(&rbuf);
-    return False;
-  }
-
-  /* send the data on \PIPE\ */
-  if (rpc_api_pipe_req(cli, NET_LOGON_CTRL2, &buf, &rbuf))
-  {
-    NET_R_LOGON_CTRL2 r_l;
-
-    /*
-     * Unmarshall the return buffer.
-     */
-    ok = net_io_r_logon_ctrl2("", &r_l, &rbuf, 0);
-               
-    if (ok && r_l.status != 0)
-    {
-      /* report error code */
-      DEBUG(0,("do_net_logon_ctrl2: Error %s\n", nt_errstr(r_l.status)));
-      cli->nt_error = r_l.status;
-      ok = False;
-    }
-  }
-
-  prs_mem_free(&buf);
-  prs_mem_free(&rbuf);
-
-  return ok;
-}
-#endif
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       struct netr_Credential clnt_chal_send;
+       struct netr_Credential srv_chal_recv;
+       struct dcinfo *dc;
 
-/****************************************************************************
-LSA Authenticate 2
+       SMB_ASSERT(cli->pipe_idx == PI_NETLOGON);
 
-Send the client credential, receive back a server credential.
-Ensure that the server credential returned matches the session key 
-encrypt of the server challenge originally received. JRA.
-****************************************************************************/
+       dc = cli->dc;
+       if (!dc) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-NTSTATUS cli_net_auth2(struct cli_state *cli, uint16 sec_chan, 
-                       uint32 neg_flags, DOM_CHAL *srv_chal)
-{
-  prs_struct rbuf;
-  prs_struct buf; 
-  NET_Q_AUTH_2 q_a;
-  BOOL ok = False;
-  NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-  prs_init(&buf , 1024, cli->mem_ctx, MARSHALL);
-  prs_init(&rbuf, 0,    cli->mem_ctx, UNMARSHALL);
-
-  /* create and send a MSRPC command with api NET_AUTH2 */
-
-  DEBUG(4,("cli_net_auth2: srv:%s acct:%s sc:%x mc: %s chal %s neg: %x\n",
-          cli->srv_name_slash, cli->mach_acct, sec_chan, global_myname,
-          credstr(cli->clnt_cred.challenge.data), neg_flags));
-
-  /* store the parameters */
-  init_q_auth_2(&q_a, cli->srv_name_slash, cli->mach_acct, 
-               sec_chan, global_myname, &cli->clnt_cred.challenge, neg_flags);
-
-  /* turn parameters into data stream */
-  if(!net_io_q_auth_2("", &q_a,  &buf, 0)) {
-    DEBUG(0,("cli_net_auth2: Error : failed to marshall NET_Q_AUTH_2 struct.\n"));
-    prs_mem_free(&buf);
-    prs_mem_free(&rbuf);
-    return result;
-  }
-
-  /* send the data on \PIPE\ */
-  if (rpc_api_pipe_req(cli, NET_AUTH2, &buf, &rbuf))
-  {
-    NET_R_AUTH_2 r_a;
-
-    ok = net_io_r_auth_2("", &r_a, &rbuf, 0);
-    result = r_a.status;
-
-    if (ok && !NT_STATUS_IS_OK(result))
-    {
-      /* report error code */
-      DEBUG(0,("cli_net_auth2: Error %s\n", nt_errstr(result)));
-      ok = False;
-    }
-
-    if (ok)
-    {
-      /* 
-       * Check the returned value using the initial
-       * server received challenge.
-       */
-      UTIME zerotime;
-
-      zerotime.time = 0;
-      if(cred_assert( &r_a.srv_chal, cli->sess_key, srv_chal, zerotime) == 0) {
-        /*
-         * Server replied with bad credential. Fail.
-         */
-        DEBUG(0,("cli_net_auth2: server %s replied with bad credential (bad machine \
-password ?).\n", cli->desthost ));
-        ok = False;
-      }
-    }
+       /* Ensure we don't reuse any of this state. */
+       ZERO_STRUCTP(dc);
 
-#if 0
-    /*
-     * Try commenting this out to see if this makes the connect
-     * work for a NT 3.51 PDC. JRA.
-     */
-
-    if (ok && r_a.srv_flgs.neg_flags != q_a.clnt_flgs.neg_flags)
-    {
-      /* report different neg_flags */
-      DEBUG(0,("cli_net_auth2: error neg_flags (q,r) differ - (%x,%x)\n",
-          q_a.clnt_flgs.neg_flags, r_a.srv_flgs.neg_flags));
-      ok = False;
-    }
-#endif
+       /* Store the machine account password we're going to use. */
+       memcpy(dc->mach_pw, machine_pwd, 16);
+
+       fstrcpy(dc->remote_machine, "\\\\");
+       fstrcat(dc->remote_machine, server_name);
+
+       fstrcpy(dc->domain, domain);
 
-  }
+       fstr_sprintf( dc->mach_acct, "%s$", machine_account);
 
-  prs_mem_free(&buf);
-  prs_mem_free(&rbuf);
+       /* Create the client challenge. */
+       generate_random_buffer(clnt_chal_send.data, 8);
 
-  return result;
+       /* Get the server challenge. */
+       result = rpccli_netr_ServerReqChallenge(cli, cli->mem_ctx,
+                                               dc->remote_machine,
+                                               clnt_name,
+                                               &clnt_chal_send,
+                                               &srv_chal_recv);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
+
+       /* Calculate the session key and client credentials */
+       creds_client_init(*neg_flags_inout,
+                       dc,
+                       &clnt_chal_send,
+                       &srv_chal_recv,
+                       machine_pwd,
+                       &clnt_chal_send);
+
+       /*
+        * Send client auth-2 challenge and receive server repy.
+        */
+
+       result = rpccli_netr_ServerAuthenticate2(cli, cli->mem_ctx,
+                                                dc->remote_machine,
+                                                dc->mach_acct,
+                                                sec_chan_type,
+                                                clnt_name,
+                                                &clnt_chal_send, /* input. */
+                                                &srv_chal_recv, /* output. */
+                                                neg_flags_inout);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
+
+       /*
+        * Check the returned value using the initial
+        * server received challenge.
+        */
+
+       if (!netlogon_creds_client_check(dc, &srv_chal_recv)) {
+               /*
+                * Server replied with bad credential. Fail.
+                */
+               DEBUG(0,("rpccli_netlogon_setup_creds: server %s "
+                       "replied with bad credential\n",
+                       cli->cli->desthost ));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       DEBUG(5,("rpccli_netlogon_setup_creds: server %s credential "
+               "chain established.\n",
+               cli->cli->desthost ));
+
+       return NT_STATUS_OK;
 }
 
-/****************************************************************************
-LSA Request Challenge. Sends our challenge to server, then gets
-server response. These are used to generate the credentials.
-****************************************************************************/
+/* Logon domain user */
 
-BOOL cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal)
+NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
+                                  TALLOC_CTX *mem_ctx,
+                                  uint32 logon_parameters,
+                                  const char *domain,
+                                  const char *username,
+                                  const char *password,
+                                  const char *workstation,
+                                  int logon_type)
 {
-  prs_struct rbuf;
-  prs_struct buf; 
-  NET_Q_REQ_CHAL q_c;
-  BOOL valid_chal = False;
-
-  prs_init(&buf , 1024, cli->mem_ctx, MARSHALL);
-  prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
-
-  /* create and send a MSRPC command with api NET_REQCHAL */
-
-  DEBUG(4,("cli_net_req_chal: LSA Request Challenge from %s to %s: %s\n",
-         cli->desthost, global_myname, credstr(clnt_chal->data)));
-
-  /* store the parameters */
-  init_q_req_chal(&q_c, cli->srv_name_slash, 
-                 global_myname, clnt_chal);
-
-  /* turn parameters into data stream */
-  if(!net_io_q_req_chal("", &q_c,  &buf, 0)) {
-    DEBUG(0,("cli_net_req_chal: Error : failed to marshall NET_Q_REQ_CHAL struct.\n"));
-    prs_mem_free(&buf);
-    prs_mem_free(&rbuf);
-    return False;
-  }
-
-  /* send the data on \PIPE\ */
-  if (rpc_api_pipe_req(cli, NET_REQCHAL, &buf, &rbuf))
-  {
-    NET_R_REQ_CHAL r_c;
-    BOOL ok;
-
-    ok = net_io_r_req_chal("", &r_c, &rbuf, 0);
-               
-    if (ok && !NT_STATUS_IS_OK(r_c.status))
-    {
-      /* report error code */
-      DEBUG(0,("cli_net_req_chal: Error %s\n", nt_errstr(r_c.status)));
-      ok = False;
-    }
-
-    if (ok)
-    {
-      /* ok, at last: we're happy. return the challenge */
-      memcpy(srv_chal, r_c.srv_chal.data, sizeof(srv_chal->data));
-      valid_chal = True;
-    }
-  }
-
-  prs_mem_free(&buf);
-  prs_mem_free(&rbuf);
-
-  return valid_chal;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       struct netr_Authenticator clnt_creds;
+       struct netr_Authenticator ret_creds;
+       union netr_LogonLevel *logon;
+       union netr_Validation validation;
+       uint8_t authoritative;
+       int validation_level = 3;
+       fstring clnt_name_slash;
+       uint8 zeros[16];
+
+       ZERO_STRUCT(ret_creds);
+       ZERO_STRUCT(zeros);
+
+       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+       if (!logon) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (workstation) {
+               fstr_sprintf( clnt_name_slash, "\\\\%s", workstation );
+       } else {
+               fstr_sprintf( clnt_name_slash, "\\\\%s", global_myname() );
+       }
+
+       /* Initialise input parameters */
+
+       netlogon_creds_client_step(cli->dc, &clnt_creds);
+
+       switch (logon_type) {
+       case INTERACTIVE_LOGON_TYPE: {
+
+               struct netr_PasswordInfo *password_info;
+
+               struct samr_Password lmpassword;
+               struct samr_Password ntpassword;
+
+               unsigned char lm_owf_user_pwd[16], nt_owf_user_pwd[16];
+
+               unsigned char lm_owf[16];
+               unsigned char nt_owf[16];
+               unsigned char key[16];
+
+               password_info = TALLOC_ZERO_P(mem_ctx, struct netr_PasswordInfo);
+               if (!password_info) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               nt_lm_owf_gen(password, nt_owf_user_pwd, lm_owf_user_pwd);
+
+#ifdef DEBUG_PASSWORD
+               DEBUG(100,("lm cypher:"));
+               dump_data(100, lm_owf_user_pwd, 16);
+
+               DEBUG(100,("nt cypher:"));
+               dump_data(100, nt_owf_user_pwd, 16);
+#endif
+               memset(key, 0, 16);
+               memcpy(key, cli->dc->sess_key, 8);
+
+               memcpy(lm_owf, lm_owf_user_pwd, 16);
+               SamOEMhash(lm_owf, key, 16);
+               memcpy(nt_owf, nt_owf_user_pwd, 16);
+               SamOEMhash(nt_owf, key, 16);
+
+#ifdef DEBUG_PASSWORD
+               DEBUG(100,("encrypt of lm owf password:"));
+               dump_data(100, lm_owf, 16);
+
+               DEBUG(100,("encrypt of nt owf password:"));
+               dump_data(100, nt_owf, 16);
+#endif
+               memcpy(lmpassword.hash, lm_owf, 16);
+               memcpy(ntpassword.hash, nt_owf, 16);
+
+               init_netr_PasswordInfo(password_info,
+                                      domain,
+                                      logon_parameters,
+                                      0xdead,
+                                      0xbeef,
+                                      username,
+                                      clnt_name_slash,
+                                      lmpassword,
+                                      ntpassword);
+
+               logon->password = password_info;
+
+               break;
+       }
+       case NET_LOGON_TYPE: {
+               struct netr_NetworkInfo *network_info;
+               uint8 chal[8];
+               unsigned char local_lm_response[24];
+               unsigned char local_nt_response[24];
+               struct netr_ChallengeResponse lm;
+               struct netr_ChallengeResponse nt;
+
+               ZERO_STRUCT(lm);
+               ZERO_STRUCT(nt);
+
+               network_info = TALLOC_ZERO_P(mem_ctx, struct netr_NetworkInfo);
+               if (!network_info) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               generate_random_buffer(chal, 8);
+
+               SMBencrypt(password, chal, local_lm_response);
+               SMBNTencrypt(password, chal, local_nt_response);
+
+               lm.length = 24;
+               lm.data = local_lm_response;
+
+               nt.length = 24;
+               nt.data = local_nt_response;
+
+               init_netr_NetworkInfo(network_info,
+                                     domain,
+                                     logon_parameters,
+                                     0xdead,
+                                     0xbeef,
+                                     username,
+                                     clnt_name_slash,
+                                     chal,
+                                     nt,
+                                     lm);
+
+               logon->network = network_info;
+
+               break;
+       }
+       default:
+               DEBUG(0, ("switch value %d not supported\n",
+                       logon_type));
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       result = rpccli_netr_LogonSamLogon(cli, mem_ctx,
+                                          cli->dc->remote_machine,
+                                          global_myname(),
+                                          &clnt_creds,
+                                          &ret_creds,
+                                          logon_type,
+                                          logon,
+                                          validation_level,
+                                          &validation,
+                                          &authoritative);
+
+       if (memcmp(zeros, &ret_creds.cred.data, sizeof(ret_creds.cred.data)) != 0) {
+               /* Check returned credentials if present. */
+               if (!netlogon_creds_client_check(cli->dc, &ret_creds.cred)) {
+                       DEBUG(0,("rpccli_netlogon_sam_logon: credentials chain check failed\n"));
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+       }
+
+       return result;
 }
-/***************************************************************************
- LSA SAM Logon internal - interactive or network. Does level 2 or 3 but always
- returns level 3.
-****************************************************************************/
 
-static NTSTATUS cli_net_sam_logon_internal(struct cli_state *cli, NET_ID_INFO_CTR *ctr, 
-                                          NET_USER_INFO_3 *user_info3, 
-                                          uint16 validation_level)
+
+/**
+ * Logon domain user with an 'network' SAM logon
+ *
+ * @param info3 Pointer to a NET_USER_INFO_3 already allocated by the caller.
+ **/
+
+NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
+                                          TALLOC_CTX *mem_ctx,
+                                          uint32 logon_parameters,
+                                          const char *server,
+                                          const char *username,
+                                          const char *domain,
+                                          const char *workstation,
+                                          const uint8 chal[8],
+                                          DATA_BLOB lm_response,
+                                          DATA_BLOB nt_response,
+                                          struct netr_SamInfo3 **info3)
 {
-       DOM_CRED new_clnt_cred;
-       DOM_CRED dummy_rtn_creds;
-       prs_struct rbuf;
-       prs_struct buf; 
-       NET_Q_SAM_LOGON q_s;
-       NET_R_SAM_LOGON r_s;
-       NTSTATUS retval = NT_STATUS_OK;
-
-       gen_next_creds( cli, &new_clnt_cred);
-
-       prs_init(&buf , 1024, cli->mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0,    cli->mem_ctx, UNMARSHALL);
-
-       /* create and send a MSRPC command with api NET_SAMLOGON */
-
-       DEBUG(4,("cli_net_sam_logon_internal: srv:%s mc:%s clnt %s %x ll: %d\n",
-             cli->srv_name_slash, global_myname, 
-             credstr(new_clnt_cred.challenge.data), cli->clnt_cred.timestamp.time,
-             ctr->switch_value));
-
-       memset(&dummy_rtn_creds, '\0', sizeof(dummy_rtn_creds));
-       dummy_rtn_creds.timestamp.time = time(NULL);
-
-       /* store the parameters */
-       q_s.validation_level = validation_level;
-       init_sam_info(&q_s.sam_id, cli->srv_name_slash, 
-               global_myname, &new_clnt_cred, &dummy_rtn_creds, 
-               ctr->switch_value, ctr);
-
-       /* turn parameters into data stream */
-       if(!net_io_q_sam_logon("", &q_s,  &buf, 0)) {
-               DEBUG(0,("cli_net_sam_logon_internal: Error : failed to marshall NET_Q_SAM_LOGON struct.\n"));
-               retval = NT_STATUS_NO_MEMORY;
-               goto out;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       int validation_level = 3;
+       const char *workstation_name_slash;
+       const char *server_name_slash;
+       uint8 zeros[16];
+       struct netr_Authenticator clnt_creds;
+       struct netr_Authenticator ret_creds;
+       union netr_LogonLevel *logon = NULL;
+       struct netr_NetworkInfo *network_info;
+       uint8_t authoritative;
+       union netr_Validation validation;
+       struct netr_ChallengeResponse lm;
+       struct netr_ChallengeResponse nt;
+       struct netr_UserSessionKey user_session_key;
+       struct netr_LMSessionKey lmsesskey;
+
+       *info3 = NULL;
+
+       ZERO_STRUCT(zeros);
+       ZERO_STRUCT(ret_creds);
+
+       ZERO_STRUCT(lm);
+       ZERO_STRUCT(nt);
+
+       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+       if (!logon) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       /* send the data on \PIPE\ */
-       if (!rpc_api_pipe_req(cli, NET_SAMLOGON, &buf, &rbuf)) {
-               DEBUG(0,("cli_net_sam_logon_internal: Error rpc_api_pipe_req failed.\n"));
-                retval = NT_STATUS_UNSUCCESSFUL;
-               goto out;
+       network_info = TALLOC_ZERO_P(mem_ctx, struct netr_NetworkInfo);
+       if (!network_info) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       r_s.user = user_info3;
+       netlogon_creds_client_step(cli->dc, &clnt_creds);
 
-       if(!net_io_r_sam_logon("", &r_s, &rbuf, 0)) {
-               DEBUG(0,("cli_net_sam_logon_internal: Error : failed to unmarshal NET_R_SAM_LOGON struct.\n"));
-               retval = NT_STATUS_NO_MEMORY;
-               goto out;
+       if (server[0] != '\\' && server[1] != '\\') {
+               server_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", server);
+       } else {
+               server_name_slash = server;
        }
-               
-       retval = r_s.status;
 
-       /*
-        * Don't treat NT_STATUS_INVALID_INFO_CLASS as an error - we will re-issue
-        * the call.
-        */
-       
-       if (NT_STATUS_V(retval) == NT_STATUS_V(NT_STATUS_INVALID_INFO_CLASS)) {
-               goto out;
+       if (workstation[0] != '\\' && workstation[1] != '\\') {
+               workstation_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", workstation);
+       } else {
+               workstation_name_slash = workstation;
        }
 
-       if (!NT_STATUS_IS_OK(retval)) {
-               /* report error code */
-               DEBUG(0,("cli_net_sam_logon_internal: %s\n", nt_errstr(r_s.status)));
-               goto out;
+       if (!workstation_name_slash || !server_name_slash) {
+               DEBUG(0, ("talloc_asprintf failed!\n"));
+               return NT_STATUS_NO_MEMORY;
        }
 
-       /* Update the credentials. */
-       if (!clnt_deal_with_creds(cli->sess_key, &cli->clnt_cred, &r_s.srv_creds)) {
-               /*
-                * Server replied with bad credential. Fail.
-                */
-               DEBUG(0,("cli_net_sam_logon_internal: server %s replied with bad credential (bad machine \
-password ?).\n", cli->desthost ));
-               retval = NT_STATUS_WRONG_PASSWORD;
+       /* Initialise input parameters */
+
+       lm.data = lm_response.data;
+       lm.length = lm_response.length;
+       nt.data = nt_response.data;
+       nt.length = nt_response.length;
+
+       init_netr_NetworkInfo(network_info,
+                             domain,
+                             logon_parameters,
+                             0xdead,
+                             0xbeef,
+                             username,
+                             workstation_name_slash,
+                             (uint8_t *) chal,
+                             nt,
+                             lm);
+
+       logon->network = network_info;
+
+       /* Marshall data and send request */
+
+       result = rpccli_netr_LogonSamLogon(cli, mem_ctx,
+                                          server_name_slash,
+                                          global_myname(),
+                                          &clnt_creds,
+                                          &ret_creds,
+                                          NET_LOGON_TYPE,
+                                          logon,
+                                          validation_level,
+                                          &validation,
+                                          &authoritative);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
        }
-       
-       if (r_s.switch_value != validation_level) {
-               /* report different switch_value */
-               DEBUG(0,("cli_net_sam_logon: switch_value of %x expected %x\n", (unsigned int)validation_level,
-                        (unsigned int)r_s.switch_value));
-               retval = NT_STATUS_INVALID_PARAMETER;
+
+       user_session_key = validation.sam3->base.key;
+       lmsesskey = validation.sam3->base.LMSessKey;
+
+       if (memcmp(zeros, user_session_key.key, 16) != 0) {
+               SamOEMhash(user_session_key.key, cli->dc->sess_key, 16);
        }
 
-out:
+       if (memcmp(zeros, lmsesskey.key, 8) != 0) {
+               SamOEMhash(lmsesskey.key, cli->dc->sess_key, 8);
+       }
 
-       prs_mem_free(&buf);
-       prs_mem_free(&rbuf);
-       
-       return retval;
-}
+       if (memcmp(zeros, ret_creds.cred.data, sizeof(ret_creds.cred.data)) != 0) {
+               /* Check returned credentials if present. */
+               if (!netlogon_creds_client_check(cli->dc, &ret_creds.cred)) {
+                       DEBUG(0,("rpccli_netlogon_sam_network_logon: credentials chain check failed\n"));
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+       }
 
-/***************************************************************************
-LSA SAM Logon - interactive or network.
-****************************************************************************/
+       *info3 = validation.sam3;
 
-NTSTATUS cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr, 
-                         NET_USER_INFO_3 *user_info3)
+       return result;
+}
+
+NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
+                                             TALLOC_CTX *mem_ctx,
+                                             uint32 logon_parameters,
+                                             const char *server,
+                                             const char *username,
+                                             const char *domain,
+                                             const char *workstation,
+                                             const uint8 chal[8],
+                                             DATA_BLOB lm_response,
+                                             DATA_BLOB nt_response,
+                                             struct netr_SamInfo3 **info3)
 {
-       uint16 validation_level=3;
-       NTSTATUS result;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       int validation_level = 3;
+       const char *workstation_name_slash;
+       const char *server_name_slash;
+       uint8 zeros[16];
+       union netr_LogonLevel *logon = NULL;
+       struct netr_NetworkInfo *network_info;
+       uint8_t authoritative;
+       union netr_Validation validation;
+       struct netr_ChallengeResponse lm;
+       struct netr_ChallengeResponse nt;
+       struct netr_UserSessionKey user_session_key;
+       struct netr_LMSessionKey lmsesskey;
+       uint32_t flags = 0;
+
+       *info3 = NULL;
+
+       ZERO_STRUCT(zeros);
+
+       ZERO_STRUCT(lm);
+       ZERO_STRUCT(nt);
+
+       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+       if (!logon) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       network_info = TALLOC_ZERO_P(mem_ctx, struct netr_NetworkInfo);
+       if (!network_info) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       if (server[0] != '\\' && server[1] != '\\') {
+               server_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", server);
+       } else {
+               server_name_slash = server;
+       }
 
-       result = cli_net_sam_logon_internal(cli, ctr, user_info3, 
-                                            validation_level);
+       if (workstation[0] != '\\' && workstation[1] != '\\') {
+               workstation_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", workstation);
+       } else {
+               workstation_name_slash = workstation;
+       }
 
-       if (NT_STATUS_IS_OK(result)) {
-               DEBUG(10,("cli_net_sam_logon: Success \n"));
-       } else if (NT_STATUS_V(result) == NT_STATUS_V(NT_STATUS_INVALID_INFO_CLASS)) {
-               DEBUG(10,("cli_net_sam_logon: STATUS INVALID INFO CLASS \n"));
+       if (!workstation_name_slash || !server_name_slash) {
+               DEBUG(0, ("talloc_asprintf failed!\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
 
-               validation_level=2;
+       /* Initialise input parameters */
+
+       lm.data = lm_response.data;
+       lm.length = lm_response.length;
+       nt.data = nt_response.data;
+       nt.length = nt_response.length;
+
+       init_netr_NetworkInfo(network_info,
+                             domain,
+                             logon_parameters,
+                             0xdead,
+                             0xbeef,
+                             username,
+                             workstation_name_slash,
+                             (uint8_t *) chal,
+                             nt,
+                             lm);
+
+       logon->network = network_info;
+
+        /* Marshall data and send request */
+
+       result = rpccli_netr_LogonSamLogonEx(cli, mem_ctx,
+                                            server_name_slash,
+                                            global_myname(),
+                                            NET_LOGON_TYPE,
+                                            logon,
+                                            validation_level,
+                                            &validation,
+                                            &authoritative,
+                                            &flags);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
 
-               /*
-                * Since this is the second time we call this function, don't care
-                * for the error. If its error, return False. 
-                */
+       user_session_key = validation.sam3->base.key;
+       lmsesskey = validation.sam3->base.LMSessKey;
 
-               result = cli_net_sam_logon_internal(cli, ctr, user_info3,
-                                                    validation_level);
+       if (memcmp(zeros, user_session_key.key, 16) != 0) {
+               SamOEMhash(user_session_key.key, cli->dc->sess_key, 16);
        }
 
-       return result;
-}
+       if (memcmp(zeros, lmsesskey.key, 8) != 0) {
+               SamOEMhash(lmsesskey.key, cli->dc->sess_key, 8);
+       }
 
-/***************************************************************************
-LSA SAM Logoff.
+       *info3 = validation.sam3;
 
-This currently doesnt work correctly as the domain controller 
-returns NT_STATUS_INVALID_INFO_CLASS - we obviously need to
-send a different info level. Right now though, I'm not sure
-what that needs to be (I need to see one on the wire before
-I can be sure). JRA.
-****************************************************************************/
-BOOL cli_net_sam_logoff(struct cli_state *cli, NET_ID_INFO_CTR *ctr)
-{
-  DOM_CRED new_clnt_cred;
-  DOM_CRED dummy_rtn_creds;
-  prs_struct rbuf;
-  prs_struct buf; 
-  NET_Q_SAM_LOGOFF q_s;
-  BOOL ok = False;
-
-  gen_next_creds( cli, &new_clnt_cred);
-
-  prs_init(&buf , 1024, cli->mem_ctx, MARSHALL);
-  prs_init(&rbuf, 0,    cli->mem_ctx, UNMARSHALL);
-
-  /* create and send a MSRPC command with api NET_SAMLOGOFF */
-
-  DEBUG(4,("cli_net_sam_logoff: srv:%s mc:%s clnt %s %x ll: %d\n",
-            cli->srv_name_slash, global_myname,
-            credstr(new_clnt_cred.challenge.data), new_clnt_cred.timestamp.time,
-            ctr->switch_value));
-
-  memset(&dummy_rtn_creds, '\0', sizeof(dummy_rtn_creds));
-
-  init_sam_info(&q_s.sam_id, cli->srv_name_slash, 
-               global_myname, &new_clnt_cred, &dummy_rtn_creds, 
-               ctr->switch_value, ctr);
-
-  /* turn parameters into data stream */
-  if(!net_io_q_sam_logoff("", &q_s,  &buf, 0)) {
-    DEBUG(0,("cli_net_sam_logoff: Error : failed to marshall NET_Q_SAM_LOGOFF struct.\n"));
-    prs_mem_free(&buf);
-    prs_mem_free(&rbuf);
-    return False;
-  }
-
-  /* send the data on \PIPE\ */
-  if (rpc_api_pipe_req(cli, NET_SAMLOGOFF, &buf, &rbuf))
-  {
-    NET_R_SAM_LOGOFF r_s;
-
-    ok = net_io_r_sam_logoff("", &r_s, &rbuf, 0);
-               
-    if (ok && !NT_STATUS_IS_OK(r_s.status))
-    {
-      /* report error code */
-      DEBUG(0,("cli_net_sam_logoff: %s\n", nt_errstr(r_s.status)));
-      ok = False;
-    }
-
-    /* Update the credentials. */
-    if (ok && !clnt_deal_with_creds(cli->sess_key, &(cli->clnt_cred), &(r_s.srv_creds)))
-    {
-      /*
-       * Server replied with bad credential. Fail.
-       */
-      DEBUG(0,("cli_net_sam_logoff: server %s replied with bad credential (bad machine \
-password ?).\n", cli->desthost ));
-      ok = False;
-    }
-  }
-
-  prs_mem_free(&buf);
-  prs_mem_free(&rbuf);
-
-  return ok;
+       return result;
+
+        return result;
 }