Sync 3.0 branch with HEAD

(This used to be commit 3823a2ff5a3c6edf325e2ac31bab50175420f0b1)

1 files changed, 586 insertions, 392 deletions

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 90c8a34c21..acc9135542 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -1,34 +1,258 @@
 /* 
- *  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) Luke Kenneth Casson Leighton 1996-2000
+   Copyright (C) Tim Potter 2001
+   Copyright (C) Paul Ashton                       1997.
+   Copyright (C) Jeremy Allison                    1998.
+   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
+   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. */
+
+NTSTATUS cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, 
+			  DOM_CHAL *srv_chal)
+{
+        prs_struct qbuf, rbuf;
+        NET_Q_REQ_CHAL q;
+        NET_R_REQ_CHAL r;
+        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+        extern pstring global_myname;
+
+        prs_init(&qbuf, MAX_PDU_FRAG_LEN, 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",
+                 global_myname, cli->desthost, credstr(clnt_chal->data)));
+        
+        /* store the parameters */
+        init_q_req_chal(&q, cli->srv_name_slash, global_myname, clnt_chal);
+        
+        /* Marshall data and send request */
+
+        if (!net_io_q_req_chal("", &q,  &qbuf, 0) ||
+            !rpc_api_pipe_req(cli, NET_REQCHAL, &qbuf, &rbuf)) {
+                goto done;
+        }
+
+        /* Unmarhall response */
+
+        if (!net_io_r_req_chal("", &r, &rbuf, 0)) {
+                goto done;
+        }
+
+        result = r.status;
+
+        /* Return result */
+
+        if (NT_STATUS_IS_OK(result)) {
+                memcpy(srv_chal, r.srv_chal.data, sizeof(srv_chal->data));
+        }
+        
+ done:
+        prs_mem_free(&qbuf);
+        prs_mem_free(&rbuf);
+        
+        return result;
+}
+
+/****************************************************************************
+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.
+****************************************************************************/
+
+NTSTATUS cli_net_auth2(struct cli_state *cli, 
+		       uint16 sec_chan, 
+		       uint32 neg_flags, DOM_CHAL *srv_chal)
+{
+        prs_struct qbuf, rbuf;
+        NET_Q_AUTH_2 q;
+        NET_R_AUTH_2 r;
+        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+	extern pstring global_myname;
+
+        prs_init(&qbuf, MAX_PDU_FRAG_LEN, 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, 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,  &qbuf, 0) ||
+            !rpc_api_pipe_req(cli, NET_AUTH2, &qbuf, &rbuf)) {
+                goto done;
+        }
+        
+        /* Unmarshall response */
+        
+        if (!net_io_r_auth_2("", &r, &rbuf, 0)) {
+                goto done;
+        }
+
+        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->desthost ));
+                        result = NT_STATUS_ACCESS_DENIED;
+                        goto done;
+                }
+        }
+
+ done:
+        prs_mem_free(&qbuf);
+        prs_mem_free(&rbuf);
+        
+        return result;
+}
+
+/* Initialize domain session credentials */
+
+NTSTATUS cli_nt_setup_creds(struct cli_state *cli, 
+			    uint16 sec_chan,
+			    const unsigned char mach_pwd[16])
+{
+        DOM_CHAL clnt_chal;
+        DOM_CHAL srv_chal;
+        UTIME zerotime;
+        NTSTATUS result;
+
+        /******************* Request Challenge ********************/
+
+        generate_random_buffer(clnt_chal.data, 8, False);
+	
+        /* send a client challenge; receive a server challenge */
+        result = cli_net_req_chal(cli, &clnt_chal, &srv_chal);
+
+        if (!NT_STATUS_IS_OK(result)) {
+                DEBUG(0,("cli_nt_setup_creds: request challenge failed\n"));
+                return result;
+        }
+        
+        /**************** Long-term Session key **************/
+
+        /* calculate the session key */
+        cred_session_key(&clnt_chal, &srv_chal, mach_pwd, 
+                         cli->sess_key);
+        memset((char *)cli->sess_key+8, '\0', 8);
+
+        /******************* Authenticate 2 ********************/
+
+        /* calculate auth-2 credentials */
+        zerotime.time = 0;
+        cred_create(cli->sess_key, &clnt_chal, zerotime, 
+                    &cli->clnt_cred.challenge);
+
+        /*  
+         * Send client auth-2 challenge.
+         * Receive an auth-2 challenge response and check it.
+         */
+        
+	result = cli_net_auth2(cli, sec_chan, 0x000001ff, &srv_chal);
+
+	if (!NT_STATUS_IS_OK(result)) {
+                DEBUG(1,("cli_nt_setup_creds: auth2 challenge failed %s\n",
+			 nt_errstr(result)));
+        }
+
+        return result;
+}
+
+/* Logon Control 2 */
+
+NTSTATUS cli_netlogon_logon_ctrl2(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                                  uint32 query_level)
+{
+	prs_struct qbuf, rbuf;
+	NET_Q_LOGON_CTRL2 q;
+	NET_R_LOGON_CTRL2 r;
+	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
+
+	/* Initialise parse structures */
+
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+	/* Initialise input parameters */
+
+	init_net_q_logon_ctrl2(&q, cli->srv_name_slash, query_level);
+
+	/* Marshall data and send request */
+
+	if (!net_io_q_logon_ctrl2("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, NET_LOGON_CTRL2, &qbuf, &rbuf)) {
+		result = NT_STATUS_UNSUCCESSFUL;
+		goto done;
+	}
+
+	/* Unmarshall response */
+
+	if (!net_io_r_logon_ctrl2("", &r, &rbuf, 0)) {
+		result = NT_STATUS_UNSUCCESSFUL;
+		goto done;
+	}
+
+	result = r.status;
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
 
 /****************************************************************************
-Generate the next creds to use.
+Generate the next creds to use.  Yuck - this is a cut&paste from another
+file.  They should be combined at some stage.  )-:
 ****************************************************************************/
 
 static void gen_next_creds( struct cli_state *cli, DOM_CRED *new_clnt_cred)
@@ -47,424 +271,394 @@ static void gen_next_creds( struct cli_state *cli, DOM_CRED *new_clnt_cred)
 
 }
 
-#if UNUSED_CODE
-/****************************************************************************
-do a LSA Logon Control2
-****************************************************************************/
-BOOL cli_net_logon_ctrl2(struct cli_state *cli, NTSTATUS status_level)
+/* Sam synchronisation */
+
+NTSTATUS cli_netlogon_sam_sync(struct cli_state *cli, TALLOC_CTX *mem_ctx, DOM_CRED *ret_creds,
+                               uint32 database_id, uint32 *num_deltas,
+                               SAM_DELTA_HDR **hdr_deltas, 
+                               SAM_DELTA_CTR **deltas)
 {
-  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
+	prs_struct qbuf, rbuf;
+	NET_Q_SAM_SYNC q;
+	NET_R_SAM_SYNC r;
+	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+        DOM_CRED clnt_creds;
 
-/****************************************************************************
-LSA Authenticate 2
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
 
-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.
-****************************************************************************/
+	/* Initialise parse structures */
 
-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;
-      }
-    }
-
-#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
-
-  }
-
-  prs_mem_free(&buf);
-  prs_mem_free(&rbuf);
-
-  return result;
-}
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
-/****************************************************************************
-LSA Request Challenge. Sends our challenge to server, then gets
-server response. These are used to generate the credentials.
-****************************************************************************/
+	/* Initialise input parameters */
 
-BOOL cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal)
-{
-  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;
+        gen_next_creds(cli, &clnt_creds);
+
+	init_net_q_sam_sync(&q, cli->srv_name_slash, cli->clnt_name_slash + 2,
+                            &clnt_creds, ret_creds, database_id);
+
+	/* Marshall data and send request */
+
+	if (!net_io_q_sam_sync("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, NET_SAM_SYNC, &qbuf, &rbuf)) {
+		result = NT_STATUS_UNSUCCESSFUL;
+		goto done;
+	}
+
+	/* Unmarshall response */
+
+	if (!net_io_r_sam_sync("", cli->sess_key, &r, &rbuf, 0)) {
+		result = NT_STATUS_UNSUCCESSFUL;
+		goto done;
+	}
+
+        /* Return results */
+
+	result = r.status;
+        *num_deltas = r.num_deltas2;
+        *hdr_deltas = r.hdr_deltas;
+        *deltas = r.deltas;
+
+	memcpy(ret_creds, &r.srv_creds, sizeof(*ret_creds));
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	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)
+/* Sam synchronisation */
+
+NTSTATUS cli_netlogon_sam_deltas(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                                 uint32 database_id, UINT64_S seqnum,
+                                 uint32 *num_deltas, 
+                                 SAM_DELTA_HDR **hdr_deltas, 
+                                 SAM_DELTA_CTR **deltas)
 {
-	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;
+	prs_struct qbuf, rbuf;
+	NET_Q_SAM_DELTAS q;
+	NET_R_SAM_DELTAS r;
+	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+        DOM_CRED clnt_creds;
 
-	gen_next_creds( cli, &new_clnt_cred);
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
 
-	prs_init(&buf , 1024, cli->mem_ctx, MARSHALL);
-	prs_init(&rbuf, 0,    cli->mem_ctx, UNMARSHALL);
+	/* Initialise parse structures */
 
-	/* create and send a MSRPC command with api NET_SAMLOGON */
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
-	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));
+	/* Initialise input parameters */
 
-	memset(&dummy_rtn_creds, '\0', sizeof(dummy_rtn_creds));
-	dummy_rtn_creds.timestamp.time = time(NULL);
+        gen_next_creds(cli, &clnt_creds);
 
-	/* 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);
+	init_net_q_sam_deltas(&q, cli->srv_name_slash, 
+                              cli->clnt_name_slash + 2, &clnt_creds, 
+                              database_id, seqnum);
 
-	/* 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;
-	}
+	/* Marshall data and send request */
 
-	/* 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;
+	if (!net_io_q_sam_deltas("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, NET_SAM_DELTAS, &qbuf, &rbuf)) {
+		result = NT_STATUS_UNSUCCESSFUL;
+		goto done;
 	}
 
-	r_s.user = user_info3;
+	/* Unmarshall response */
 
-	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 (!net_io_r_sam_deltas("", cli->sess_key, &r, &rbuf, 0)) {
+		result = NT_STATUS_UNSUCCESSFUL;
+		goto done;
 	}
-		
-	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;
-	}
+        /* Return results */
 
-	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;
-	}
+	result = r.status;
+        *num_deltas = r.num_deltas2;
+        *hdr_deltas = r.hdr_deltas;
+        *deltas = r.deltas;
 
-	/* 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;
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+	return result;
+}
+
+/* Logon domain user */
+
+NTSTATUS cli_netlogon_sam_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                                char *username, 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, dummy_rtn_creds;
+        extern pstring global_myname;
+        NET_ID_INFO_CTR ctr;
+        NET_USER_INFO_3 user;
+        int validation_level = 3;
+
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
+
+	/* Initialise parse structures */
+
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+        /* Initialise input parameters */
+
+        gen_next_creds(cli, &clnt_creds);
+
+        q.validation_level = validation_level;
+
+	memset(&dummy_rtn_creds, '\0', sizeof(dummy_rtn_creds));
+	dummy_rtn_creds.timestamp.time = time(NULL);
+
+        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, lp_workgroup(), 
+                              0, /* param_ctrl */
+                              0xdead, 0xbeef, /* LUID? */
+                              username, cli->clnt_name_slash,
+                              cli->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, False);
+
+                SMBencrypt(password, chal, local_lm_response);
+                SMBNTencrypt(password, chal, local_nt_response);
+
+                init_id_info2(&ctr.auth.id2, lp_workgroup(), 
+                              0, /* param_ctrl */
+                              0xdead, 0xbeef, /* LUID? */
+                              username, cli->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));
+                goto done;
+        }
+
+        init_sam_info(&q.sam_id, cli->srv_name_slash, global_myname,
+                      &clnt_creds, &dummy_rtn_creds, logon_type,
+                      &ctr);
+
+        /* Marshall data and send request */
+
+	if (!net_io_q_sam_logon("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, NET_SAMLOGON, &qbuf, &rbuf)) {
+		goto done;
 	}
-	
-	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;
+
+	/* Unmarshall response */
+
+        r.user = &user;
+
+	if (!net_io_r_sam_logon("", &r, &rbuf, 0)) {
+		goto done;
 	}
 
-out:
+        /* Return results */
+
+	result = r.status;
 
-	prs_mem_free(&buf);
+ done:
+	prs_mem_free(&qbuf);
 	prs_mem_free(&rbuf);
-	
-	return retval;
+
+        return result;
 }
 
-/***************************************************************************
-LSA SAM Logon - interactive or network.
-****************************************************************************/
 
-NTSTATUS cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr, 
-                         NET_USER_INFO_3 *user_info3)
+/** 
+ * Logon domain user with an 'network' SAM logon 
+ *
+ * @param info3 Pointer to a NET_USER_INFO_3 already allocated by the caller.
+ **/
+
+NTSTATUS cli_netlogon_sam_network_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+					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)
+
 {
-	uint16 validation_level=3;
-	NTSTATUS result;
+	prs_struct qbuf, rbuf;
+	NET_Q_SAM_LOGON q;
+	NET_R_SAM_LOGON r;
+	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+        DOM_CRED clnt_creds, dummy_rtn_creds;
+	NET_ID_INFO_CTR ctr;
+	extern pstring global_myname;
+	int validation_level = 3;
+	char *workstation_name_slash;
+	
+	ZERO_STRUCT(q);
+	ZERO_STRUCT(r);
 
-	result = cli_net_sam_logon_internal(cli, ctr, user_info3, 
-                                            validation_level);
+	workstation_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", workstation);
+	
+	if (!workstation_name_slash) {
+		DEBUG(0, ("talloc_asprintf failed!\n"));
+		return NT_STATUS_NO_MEMORY;
+	}
 
-	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"));
+	/* Initialise parse structures */
 
-		validation_level=2;
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
 
-		/*
-		 * Since this is the second time we call this function, don't care
-		 * for the error. If its error, return False. 
-		 */
+	/* Initialise input parameters */
 
-		result = cli_net_sam_logon_internal(cli, ctr, user_info3,
-                                                    validation_level);
-	}
+	gen_next_creds(cli, &clnt_creds);
 
-	return result;
-}
+	q.validation_level = validation_level;
 
-/***************************************************************************
-LSA SAM Logoff.
+	memset(&dummy_rtn_creds, '\0', sizeof(dummy_rtn_creds));
+	dummy_rtn_creds.timestamp.time = time(NULL);
 
-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;
+        ctr.switch_value = NET_LOGON_TYPE;
 
-  gen_next_creds( cli, &new_clnt_cred);
+	init_id_info2(&ctr.auth.id2, domain,
+		      0, /* 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, cli->srv_name_slash, global_myname,
+                      &clnt_creds, &dummy_rtn_creds, NET_LOGON_TYPE,
+                      &ctr);
 
-  prs_init(&buf , 1024, cli->mem_ctx, MARSHALL);
-  prs_init(&rbuf, 0,    cli->mem_ctx, UNMARSHALL);
+        /* Marshall data and send request */
 
-  /* create and send a MSRPC command with api NET_SAMLOGOFF */
+	if (!net_io_q_sam_logon("", &q, &qbuf, 0) ||
+	    !rpc_api_pipe_req(cli, NET_SAMLOGON, &qbuf, &rbuf)) {
+		goto done;
+	}
 
-  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));
+	/* Unmarshall response */
 
-  memset(&dummy_rtn_creds, '\0', sizeof(dummy_rtn_creds));
+        r.user = info3;
 
-  init_sam_info(&q_s.sam_id, cli->srv_name_slash, 
-		global_myname, &new_clnt_cred, &dummy_rtn_creds, 
-		ctr->switch_value, ctr);
+	if (!net_io_r_sam_logon("", &r, &rbuf, 0)) {
+		goto done;
+	}
+
+        /* Return results */
+
+	result = r.status;
+
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+
+        return result;
+}
+
+/***************************************************************************
+LSA Server Password Set.
+****************************************************************************/
 
-  /* 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;
-  }
+NTSTATUS cli_net_srv_pwset(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
+			   char* machine_name, uint8 hashed_mach_pwd[16])
+{
+	prs_struct rbuf;
+	prs_struct qbuf; 
+	DOM_CRED new_clnt_cred;
+	NET_Q_SRV_PWSET q_s;
+	uint16 sec_chan_type = 2;
+	NTSTATUS nt_status;
+	char *mach_acct;
 
-  /* send the data on \PIPE\ */
-  if (rpc_api_pipe_req(cli, NET_SAMLOGOFF, &buf, &rbuf))
-  {
-    NET_R_SAM_LOGOFF r_s;
+	gen_next_creds( cli, &new_clnt_cred);
+	
+	prs_init(&qbuf , 1024, mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0,    mem_ctx, UNMARSHALL);
+	
+	/* create and send a MSRPC command with api NET_SRV_PWSET */
+	
+	mach_acct = talloc_asprintf(mem_ctx, "%s$", machine_name);
+	
+	if (!mach_acct) {
+		DEBUG(0,("talloc_asprintf failed!\n"));
+		nt_status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
 
-    ok = net_io_r_sam_logoff("", &r_s, &rbuf, 0);
+	DEBUG(4,("cli_net_srv_pwset: srv:%s acct:%s sc: %d mc: %s clnt %s %x\n",
+		 cli->srv_name_slash, mach_acct, sec_chan_type, machine_name,
+		 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->sess_key,
+			 mach_acct, sec_chan_type, machine_name, 
+			 &new_clnt_cred, (char *)hashed_mach_pwd);
+	
+	/* turn parameters into data stream */
+	if(!net_io_q_srv_pwset("", &q_s,  &qbuf, 0)) {
+		DEBUG(0,("cli_net_srv_pwset: Error : failed to marshall NET_Q_SRV_PWSET struct.\n"));
+		nt_status = NT_STATUS_UNSUCCESSFUL;
+		goto done;
+	}
+	
+	/* send the data on \PIPE\ */
+	if (rpc_api_pipe_req(cli, NET_SRVPWSET, &qbuf, &rbuf))
+	{
+		NET_R_SRV_PWSET r_s;
+		
+		if (!net_io_r_srv_pwset("", &r_s, &rbuf, 0)) {
+			nt_status =  NT_STATUS_UNSUCCESSFUL;
+			goto done;
+		}
 		
-    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 \
+		nt_status = r_s.status;
+
+		if (!NT_STATUS_IS_OK(r_s.status))
+		{
+			/* report error code */
+			DEBUG(0,("cli_net_srv_pwset: %s\n", nt_errstr(nt_status)));
+			goto done;
+		}
+
+		/* Update the credentials. */
+		if (!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);
+			nt_status = NT_STATUS_UNSUCCESSFUL;
+		}
+	}
 
-  return ok;
+ done:
+	prs_mem_free(&qbuf);
+	prs_mem_free(&rbuf);
+	
+	return nt_status;
 }
+