r11573: Adding Andrew Bartlett's patch to make machine account
[mat/samba.git] / source3 / rpc_client / cli_netlogon.c
index c18d2ae23d591f3af3cffd14990c3ff6033a95b9..af0062f2b390ab7f16739bc67881e621e5d8340f 100644 (file)
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
- *  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 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.
+*/
 
 #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.
+*/
+
+static NTSTATUS rpccli_net_req_chal(struct rpc_pipe_client *cli,
+                               TALLOC_CTX *mem_ctx,
+                               const char *server_name,
+                               const char *clnt_name,
+                               const DOM_CHAL *clnt_chal_in,
+                               DOM_CHAL *srv_chal_out)
+{
+       prs_struct qbuf, rbuf;
+       NET_Q_REQ_CHAL q;
+       NET_R_REQ_CHAL r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
-/****************************************************************************
-Generate the next creds to use.
-****************************************************************************/
+       /* create and send a MSRPC command with api NET_REQCHAL */
 
-static void gen_next_creds( struct cli_state *cli, DOM_CRED *new_clnt_cred)
-{
-  /*
-   * Create the new client credentials.
-   */
+       DEBUG(4,("cli_net_req_chal: LSA Request Challenge from %s to %s\n",
+               clnt_name, server_name));
+        
+       /* store the parameters */
+       init_q_req_chal(&q, server_name, clnt_name, clnt_chal_in);
 
-  cli->clnt_cred.timestamp.time = time(NULL);
+       /* Marshall data and send request */
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_REQCHAL,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_req_chal,
+               net_io_r_req_chal,
+               NT_STATUS_UNSUCCESSFUL);
 
-  memcpy(new_clnt_cred, &cli->clnt_cred, sizeof(*new_clnt_cred));
+       result = r.status;
 
-  /* Calculate the new credentials. */
-  cred_create(cli->sess_key, &(cli->clnt_cred.challenge),
-              new_clnt_cred->timestamp, &(new_clnt_cred->challenge));
+       /* Return result */
 
+       if (NT_STATUS_IS_OK(result)) {
+               /* Store the returned server challenge. */
+               *srv_chal_out = r.srv_chal;
+       }
+
+       return result;
 }
 
-#if UNUSED_CODE
+#if 0
 /****************************************************************************
-do a LSA Logon Control2
+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.
 ****************************************************************************/
-BOOL cli_net_logon_ctrl2(struct cli_state *cli, NTSTATUS status_level)
+
+  NTSTATUS rpccli_net_auth2(struct rpc_pipe_client *cli, 
+                      uint16 sec_chan, 
+                      uint32 *neg_flags, DOM_CHAL *srv_chal)
 {
-  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", get_nt_error_msg(r_l.status)));
-      cli->nt_error = r_l.status;
-      ok = False;
-    }
-  }
-
-  prs_mem_free(&buf);
-  prs_mem_free(&rbuf);
-
-  return ok;
+        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
 
 /****************************************************************************
-LSA Authenticate 2
+ 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.
+ 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.
 ****************************************************************************/
 
-NTSTATUS cli_net_auth2(struct cli_state *cli, uint16 sec_chan, 
-                       uint32 neg_flags, DOM_CHAL *srv_chal)
+static NTSTATUS rpccli_net_auth2(struct rpc_pipe_client *cli,
+                       TALLOC_CTX *mem_ctx,
+                       const char *server_name,
+                       const char *account_name,
+                       uint16 sec_chan_type,
+                       const char *computer_name,
+                       uint32 *neg_flags_inout,
+                       const DOM_CHAL *clnt_chal_in,
+                       DOM_CHAL *srv_chal_out)
 {
-  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", get_nt_error_msg(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;
-      }
-    }
+        prs_struct qbuf, rbuf;
+        NET_Q_AUTH_2 q;
+        NET_R_AUTH_2 r;
+        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
-#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
+        /* create and send a MSRPC command with api NET_AUTH2 */
+
+        DEBUG(4,("cli_net_auth2: srv:%s acct:%s sc:%x mc: %s neg: %x\n",
+                 server_name, account_name, sec_chan_type, computer_name,
+                 *neg_flags_inout));
+
+        /* store the parameters */
 
-  }
+        init_q_auth_2(&q, server_name, account_name, sec_chan_type,
+                     computer_name, clnt_chal_in, *neg_flags_inout);
 
-  prs_mem_free(&buf);
-  prs_mem_free(&rbuf);
+        /* turn parameters into data stream */
 
-  return result;
+       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)) {
+               *srv_chal_out = r.srv_chal;
+               *neg_flags_inout = r.srv_flgs.neg_flags;
+        }
+
+        return result;
 }
 
+#if 0  /* not currebntly used */
 /****************************************************************************
-LSA Request Challenge. Sends our challenge to server, then gets
-server response. These are used to generate the credentials.
+ LSA Authenticate 3
+
+ 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.
 ****************************************************************************/
 
-BOOL cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal)
+static NTSTATUS rpccli_net_auth3(struct rpc_pipe_client *cli, 
+                       TALLOC_CTX *mem_ctx,
+                       const char *server_name,
+                       const char *account_name,
+                       uint16 sec_chan_type,
+                       const char *computer_name,
+                       uint32 *neg_flags_inout,
+                       const DOM_CHAL *clnt_chal_in,
+                       DOM_CHAL *srv_chal_out)
 {
-  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", get_nt_error_msg(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;
-}
+        prs_struct qbuf, rbuf;
+        NET_Q_AUTH_3 q;
+        NET_R_AUTH_3 r;
+        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
-/***************************************************************************
-LSA Server Password Set.
-****************************************************************************/
+        /* create and send a MSRPC command with api NET_AUTH2 */
 
-BOOL cli_net_srv_pwset(struct cli_state *cli, uint8 hashed_mach_pwd[16])
-{
-  prs_struct rbuf;
-  prs_struct buf; 
-  DOM_CRED new_clnt_cred;
-  NET_Q_SRV_PWSET q_s;
-  BOOL ok = False;
-  uint16 sec_chan_type = 2;
-
-  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_SRV_PWSET */
-
-  DEBUG(4,("cli_net_srv_pwset: srv:%s acct:%s sc: %d mc: %s clnt %s %x\n",
-           cli->srv_name_slash, cli->mach_acct, sec_chan_type, global_myname,
-           credstr(new_clnt_cred.challenge.data), new_clnt_cred.timestamp.time));
-
-  /* store the parameters */
-  init_q_srv_pwset(&q_s, cli->srv_name_slash, 
-                  cli->mach_acct, sec_chan_type, global_myname, 
-                  &new_clnt_cred, (char *)hashed_mach_pwd);
-
-  /* turn parameters into data stream */
-  if(!net_io_q_srv_pwset("", &q_s,  &buf, 0)) {
-    DEBUG(0,("cli_net_srv_pwset: Error : failed to marshall NET_Q_SRV_PWSET struct.\n"));
-    prs_mem_free(&buf);
-    prs_mem_free(&rbuf);
-    return False;
-  }
-
-  /* send the data on \PIPE\ */
-  if (rpc_api_pipe_req(cli, NET_SRVPWSET, &buf, &rbuf))
-  {
-    NET_R_SRV_PWSET r_s;
-
-    ok = net_io_r_srv_pwset("", &r_s, &rbuf, 0);
-               
-    if (ok && !NT_STATUS_IS_OK(r_s.status))
-    {
-      /* report error code */
-      DEBUG(0,("cli_net_srv_pwset: %s\n", get_nt_error_msg(r_s.status)));
-      ok = False;
-    }
-
-    /* Update the credentials. */
-    if (ok && !clnt_deal_with_creds(cli->sess_key, &(cli->clnt_cred), &(r_s.srv_cred)))
-    {
-      /*
-       * Server replied with bad credential. Fail.
-       */
-      DEBUG(0,("cli_net_srv_pwset: server %s replied with bad credential (bad machine \
-password ?).\n", cli->desthost ));
-      ok = False;
-    }
-  }
-
-  prs_mem_free(&buf);
-  prs_mem_free(&rbuf);
-
-  return ok;
+        DEBUG(4,("cli_net_auth3: srv:%s acct:%s sc:%x mc: %s chal %s neg: %x\n",
+               server_name, account_name, sec_chan_type, computer_name,
+               credstr(clnt_chal_in->data), *neg_flags_inout));
+
+        /* store the parameters */
+        init_q_auth_3(&q, server_name, account_name, sec_chan_type,
+                       computer_name, clnt_chal_in, *neg_flags_inout);
+
+        /* turn parameters into data stream */
+
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_AUTH3,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_auth_3,
+               net_io_r_auth_3,
+               NT_STATUS_UNSUCCESSFUL);
+
+        if (NT_STATUS_IS_OK(result)) {
+               *srv_chal_out = r.srv_chal;
+               *neg_flags_inout = r.srv_flgs.neg_flags;
+        }
+
+        return result;
 }
+#endif         /* not currebntly used */
 
-/***************************************************************************
- LSA SAM Logon internal - interactive or network. Does level 2 or 3 but always
- returns level 3.
+/****************************************************************************
+ 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.
 ****************************************************************************/
 
-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)
+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],
+                               uint32 sec_chan_type,
+                               uint32 *neg_flags_inout)
 {
-       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;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       DOM_CHAL clnt_chal_send;
+       DOM_CHAL srv_chal_recv;
+       struct dcinfo *dc;
+
+       SMB_ASSERT(cli->pipe_idx == PI_NETLOGON);
 
-       gen_next_creds( cli, &new_clnt_cred);
+       dc = cli->dc;
+       if (!dc) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-       prs_init(&buf , 1024, cli->mem_ctx, MARSHALL);
-       prs_init(&rbuf, 0,    cli->mem_ctx, UNMARSHALL);
+       /* Ensure we don't reuse any of this state. */
+       ZERO_STRUCTP(dc);
 
-       /* create and send a MSRPC command with api NET_SAMLOGON */
+       /* Store the machine account password we're going to use. */
+       memcpy(dc->mach_pw, machine_pwd, 16);
 
-       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));
+       fstrcpy(dc->remote_machine, "\\\\");
+       fstrcat(dc->remote_machine, server_name);
 
-       memset(&dummy_rtn_creds, '\0', sizeof(dummy_rtn_creds));
-       dummy_rtn_creds.timestamp.time = time(NULL);
+       fstrcpy(dc->domain, domain);
 
-       /* 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;
-       }
+       fstr_sprintf( dc->mach_acct, "%s$", machine_account);
 
-       /* 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;
+       /* Create the client challenge. */
+       generate_random_buffer(clnt_chal_send.data, 8);
+
+       /* Get the server challenge. */
+       result = rpccli_net_req_chal(cli,
+                               cli->mem_ctx,
+                               dc->remote_machine,
+                               clnt_name,
+                               &clnt_chal_send,
+                               &srv_chal_recv);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
        }
 
-       r_s.user = user_info3;
+       /* Calculate the session key and client credentials */
+       creds_client_init(dc,
+                       &clnt_chal_send,
+                       &srv_chal_recv,
+                       machine_pwd,
+                       &clnt_chal_send);
 
-       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;
+        /*  
+         * Send client auth-2 challenge and receive server repy.
+         */
+
+       result = rpccli_net_auth2(cli,
+                       cli->mem_ctx,
+                       dc->remote_machine,
+                       dc->mach_acct,
+                       sec_chan_type,
+                       clnt_name,
+                       neg_flags_inout,
+                       &clnt_chal_send, /* input. */
+                       &srv_chal_recv); /* output */
+
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
        }
-               
-       retval = r_s.status;
 
        /*
-        * Don't treat NT_STATUS_INVALID_INFO_CLASS as an error - we will re-issue
-        * the call.
+        * Check the returned value using the initial
+        * server received challenge.
         */
-       
-       if (NT_STATUS_V(retval) == NT_STATUS_V(NT_STATUS_INVALID_INFO_CLASS)) {
-               goto out;
-       }
-
-       if (!NT_STATUS_IS_OK(retval)) {
-               /* report error code */
-               DEBUG(0,("cli_net_sam_logon_internal: %s\n", get_nt_error_msg(r_s.status)));
-               goto out;
-       }
 
-       /* Update the credentials. */
-       if (!clnt_deal_with_creds(cli->sess_key, &cli->clnt_cred, &r_s.srv_creds)) {
+       if (!creds_client_check(dc, &srv_chal_recv)) {
                /*
                 * 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;
-       }
-       
-       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;
+               DEBUG(0,("rpccli_netlogon_setup_creds: server %s "
+                       "replied with bad credential\n",
+                       cli->cli->desthost ));
+               return NT_STATUS_ACCESS_DENIED;
        }
 
-out:
+       DEBUG(5,("rpccli_netlogon_setup_creds: server %s credential "
+               "chain established.\n",
+               cli->cli->desthost ));
 
-       prs_mem_free(&buf);
-       prs_mem_free(&rbuf);
-       
-       return retval;
+       return NT_STATUS_OK;
 }
 
-/***************************************************************************
-LSA SAM Logon - interactive or network.
-****************************************************************************/
+/* Logon Control 2 */
 
-NTSTATUS cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr, 
-                         NET_USER_INFO_3 *user_info3)
+NTSTATUS rpccli_netlogon_logon_ctrl2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                  uint32 query_level)
 {
-       uint16 validation_level=3;
+       prs_struct qbuf, rbuf;
+       NET_Q_LOGON_CTRL2 q;
+       NET_R_LOGON_CTRL2 r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       fstring server;
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise input parameters */
+
+       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
+       init_net_q_logon_ctrl2(&q, server, query_level);
+
+       /* Marshall data and send request */
+
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_LOGON_CTRL2,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_logon_ctrl2,
+               net_io_r_logon_ctrl2,
+               NT_STATUS_UNSUCCESSFUL);
+
+       result = r.status;
+       return result;
+}
+
+/* GetDCName */
+
+NTSTATUS rpccli_netlogon_getdcname(struct rpc_pipe_client *cli,
+                                  TALLOC_CTX *mem_ctx, const char *mydcname,
+                                  const char *domainname, fstring newdcname)
+{
+       prs_struct qbuf, rbuf;
+       NET_Q_GETDCNAME q;
+       NET_R_GETDCNAME r;
        NTSTATUS result;
+       fstring mydcname_slash;
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise input parameters */
 
-       result = cli_net_sam_logon_internal(cli, ctr, user_info3, 
-                                            validation_level);
+       slprintf(mydcname_slash, sizeof(fstring)-1, "\\\\%s", mydcname);
+       init_net_q_getdcname(&q, mydcname_slash, domainname);
+
+       /* Marshall data and send request */
+
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_GETDCNAME,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_getdcname,
+               net_io_r_getdcname,
+               NT_STATUS_UNSUCCESSFUL);
+
+       result = r.status;
 
        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"));
+               rpcstr_pull_unistr2_fstring(newdcname, &r.uni_dcname);
+       }
 
-               validation_level=2;
+       return result;
+}
 
-               /*
-                * Since this is the second time we call this function, don't care
-                * for the error. If its error, return False. 
-                */
+/* Sam synchronisation */
 
-               result = cli_net_sam_logon_internal(cli, ctr, user_info3,
-                                                    validation_level);
-       } else {
-               DEBUG(10,("cli_net_sam_logon: Error\n"));
+NTSTATUS rpccli_netlogon_sam_sync(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                               uint32 database_id, uint32 next_rid, uint32 *num_deltas,
+                               SAM_DELTA_HDR **hdr_deltas, 
+                               SAM_DELTA_CTR **deltas)
+{
+       prs_struct qbuf, rbuf;
+       NET_Q_SAM_SYNC q;
+       NET_R_SAM_SYNC r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+        DOM_CRED clnt_creds;
+        DOM_CRED ret_creds;
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       ZERO_STRUCT(ret_creds);
+
+       /* Initialise input parameters */
+
+       creds_client_step(cli->dc, &clnt_creds);
+
+       prs_set_session_key(&qbuf, (const char *)cli->dc->sess_key);
+       prs_set_session_key(&rbuf, (const char *)cli->dc->sess_key);
+
+       init_net_q_sam_sync(&q, cli->dc->remote_machine, global_myname(),
+                            &clnt_creds, &ret_creds, database_id, next_rid);
+
+       /* Marshall data and send request */
+
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_SAM_SYNC,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_sam_sync,
+               net_io_r_sam_sync,
+               NT_STATUS_UNSUCCESSFUL);
+
+        /* Return results */
+
+       result = r.status;
+        *num_deltas = r.num_deltas2;
+        *hdr_deltas = r.hdr_deltas;
+        *deltas = r.deltas;
+
+       if (!NT_STATUS_IS_ERR(result)) {
+               /* Check returned credentials. */
+               if (!creds_client_check(cli->dc, &r.srv_creds.challenge)) {
+                       DEBUG(0,("cli_netlogon_sam_sync: credentials chain check failed\n"));
+                       return NT_STATUS_ACCESS_DENIED;
+               }
        }
 
        return result;
 }
 
-/***************************************************************************
-LSA SAM Logoff.
+/* Sam synchronisation */
+
+NTSTATUS rpccli_netlogon_sam_deltas(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                                 uint32 database_id, UINT64_S seqnum,
+                                 uint32 *num_deltas, 
+                                 SAM_DELTA_HDR **hdr_deltas, 
+                                 SAM_DELTA_CTR **deltas)
+{
+       prs_struct qbuf, rbuf;
+       NET_Q_SAM_DELTAS q;
+       NET_R_SAM_DELTAS r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+        DOM_CRED clnt_creds;
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise input parameters */
+
+       creds_client_step(cli->dc, &clnt_creds);
+
+       init_net_q_sam_deltas(&q, cli->dc->remote_machine,
+                              global_myname(), &clnt_creds, 
+                              database_id, seqnum);
+
+       /* Marshall data and send request */
+
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_SAM_DELTAS,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_sam_deltas,
+               net_io_r_sam_deltas,
+               NT_STATUS_UNSUCCESSFUL);
+
+        /* Return results */
+
+       result = r.status;
+        *num_deltas = r.num_deltas2;
+        *hdr_deltas = r.hdr_deltas;
+        *deltas = r.deltas;
 
-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.
+       if (!NT_STATUS_IS_ERR(result)) {
+               /* Check returned credentials. */
+               if (!creds_client_check(cli->dc, &r.srv_creds.challenge)) {
+                       DEBUG(0,("cli_netlogon_sam_sync: credentials chain check failed\n"));
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+       }
+
+       return result;
+}
+
+/* Logon domain user */
+
+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,
+                                  int logon_type)
+{
+       prs_struct qbuf, rbuf;
+       NET_Q_SAM_LOGON q;
+       NET_R_SAM_LOGON r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       DOM_CRED clnt_creds;
+       DOM_CRED ret_creds;
+        NET_ID_INFO_CTR ctr;
+        NET_USER_INFO_3 user;
+        int validation_level = 3;
+       fstring clnt_name_slash;
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+       ZERO_STRUCT(ret_creds);
+
+       fstr_sprintf( clnt_name_slash, "\\\\%s", global_myname() );
+
+        /* Initialise input parameters */
+
+       creds_client_step(cli->dc, &clnt_creds);
+
+        q.validation_level = validation_level;
+
+        ctr.switch_value = logon_type;
+
+        switch (logon_type) {
+        case INTERACTIVE_LOGON_TYPE: {
+                unsigned char lm_owf_user_pwd[16], nt_owf_user_pwd[16];
+
+                nt_lm_owf_gen(password, nt_owf_user_pwd, lm_owf_user_pwd);
+
+                init_id_info1(&ctr.auth.id1, domain, 
+                             logon_parameters, /* param_ctrl */
+                              0xdead, 0xbeef, /* LUID? */
+                              username, clnt_name_slash,
+                              (const char *)cli->dc->sess_key, lm_owf_user_pwd,
+                              nt_owf_user_pwd);
+
+                break;
+        }
+        case NET_LOGON_TYPE: {
+                uint8 chal[8];
+                unsigned char local_lm_response[24];
+                unsigned char local_nt_response[24];
+
+                generate_random_buffer(chal, 8);
+
+                SMBencrypt(password, chal, local_lm_response);
+                SMBNTencrypt(password, chal, local_nt_response);
+
+                init_id_info2(&ctr.auth.id2, domain, 
+                             logon_parameters, /* param_ctrl */
+                              0xdead, 0xbeef, /* LUID? */
+                              username, clnt_name_slash, chal,
+                              local_lm_response, 24, local_nt_response, 24);
+                break;
+        }
+        default:
+                DEBUG(0, ("switch value %d not supported\n", 
+                          ctr.switch_value));
+                return NT_STATUS_INVALID_INFO_CLASS;
+        }
+
+        r.user = &user;
+
+        init_sam_info(&q.sam_id, cli->dc->remote_machine, global_myname(),
+                      &clnt_creds, &ret_creds, logon_type,
+                      &ctr);
+
+        /* Marshall data and send request */
+
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_SAMLOGON,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_sam_logon,
+               net_io_r_sam_logon,
+               NT_STATUS_UNSUCCESSFUL);
+
+        /* Return results */
+
+       result = r.status;
+
+       if (r.buffer_creds) {
+               /* Check returned credentials if present. */
+               if (!creds_client_check(cli->dc, &r.srv_creds.challenge)) {
+                       DEBUG(0,("rpccli_netlogon_sam_logon: credentials chain check failed\n"));
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+       }
+
+        return result;
+}
+
+
+/** 
+ * 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,
+                                          NET_USER_INFO_3 *info3)
+{
+       prs_struct qbuf, rbuf;
+       NET_Q_SAM_LOGON q;
+       NET_R_SAM_LOGON r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       NET_ID_INFO_CTR ctr;
+       int validation_level = 3;
+       const char *workstation_name_slash;
+       const char *server_name_slash;
+       static uint8 zeros[16];
+       DOM_CRED clnt_creds;
+       DOM_CRED ret_creds;
+       int i;
+       
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+       ZERO_STRUCT(ret_creds);
+
+       creds_client_step(cli->dc, &clnt_creds);
+
+       if (server[0] != '\\' && server[1] != '\\') {
+               server_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", server);
+       } else {
+               server_name_slash = server;
+       }
+
+       if (workstation[0] != '\\' && workstation[1] != '\\') {
+               workstation_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", workstation);
+       } else {
+               workstation_name_slash = workstation;
+       }
+
+       if (!workstation_name_slash || !server_name_slash) {
+               DEBUG(0, ("talloc_asprintf failed!\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* Initialise input parameters */
+
+       q.validation_level = validation_level;
+
+        ctr.switch_value = NET_LOGON_TYPE;
+
+       init_id_info2(&ctr.auth.id2, domain,
+                     logon_parameters, /* param_ctrl */
+                     0xdead, 0xbeef, /* LUID? */
+                     username, workstation_name_slash, (const uchar*)chal,
+                     lm_response.data, lm_response.length, nt_response.data, nt_response.length);
+        init_sam_info(&q.sam_id, server_name_slash, global_myname(),
+                      &clnt_creds, &ret_creds, NET_LOGON_TYPE,
+                      &ctr);
+
+        r.user = info3;
+
+        /* Marshall data and send request */
+
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_SAMLOGON,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_sam_logon,
+               net_io_r_sam_logon,
+               NT_STATUS_UNSUCCESSFUL);
+
+       if (memcmp(zeros, info3->user_sess_key, 16) != 0) {
+               SamOEMhash(info3->user_sess_key, cli->dc->sess_key, 16);
+       } else {
+               memset(info3->user_sess_key, '\0', 16);
+       }
+
+       if (memcmp(zeros, info3->lm_sess_key, 8) != 0) {
+               SamOEMhash(info3->lm_sess_key, cli->dc->sess_key, 8);
+       } else {
+               memset(info3->lm_sess_key, '\0', 8);
+       }
+
+       memset(&info3->acct_flags, '\0', 4);
+       for (i=0; i < 7; i++) {
+               memset(&info3->unknown[i], '\0', 4);
+       }
+
+        /* Return results */
+
+       result = r.status;
+
+       if (r.buffer_creds) {
+               /* Check returned credentials if present. */
+               if (!creds_client_check(cli->dc, &r.srv_creds.challenge)) {
+                       DEBUG(0,("rpccli_netlogon_sam_network_logon: credentials chain check failed\n"));
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+       }
+
+        return result;
+}
+
+/***************************************************************************
+LSA Server Password Set.
 ****************************************************************************/
-BOOL cli_net_sam_logoff(struct cli_state *cli, NET_ID_INFO_CTR *ctr)
+
+NTSTATUS rpccli_net_srv_pwset(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
+                          const char *machine_name, const uint8 hashed_mach_pwd[16])
 {
-  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", get_nt_error_msg(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;
+       prs_struct rbuf;
+       prs_struct qbuf; 
+       DOM_CRED clnt_creds;
+       NET_Q_SRV_PWSET q;
+       NET_R_SRV_PWSET r;
+       uint16 sec_chan_type = 2;
+       NTSTATUS result;
+
+       creds_client_step(cli->dc, &clnt_creds);
+       
+       DEBUG(4,("cli_net_srv_pwset: srv:%s acct:%s sc: %d mc: %s\n",
+                cli->dc->remote_machine, cli->dc->mach_acct, sec_chan_type, machine_name));
+       
+        /* store the parameters */
+       init_q_srv_pwset(&q, cli->dc->remote_machine, (const char *)cli->dc->sess_key,
+                        cli->dc->mach_acct, sec_chan_type, machine_name, 
+                        &clnt_creds, hashed_mach_pwd);
+       
+       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_SRVPWSET,
+               q, r,
+               qbuf, rbuf,
+               net_io_q_srv_pwset,
+               net_io_r_srv_pwset,
+               NT_STATUS_UNSUCCESSFUL);
+
+       result = r.status;
+
+       if (!NT_STATUS_IS_OK(result)) {
+               /* report error code */
+               DEBUG(0,("cli_net_srv_pwset: %s\n", nt_errstr(result)));
+       }
+
+       /* Always check returned credentials. */
+       if (!creds_client_check(cli->dc, &r.srv_cred.challenge)) {
+               DEBUG(0,("rpccli_net_srv_pwset: credentials chain check failed\n"));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       return result;
 }