s3-rpc_client: use netlogon_creds_aes_encrypt in interactive netlogon samlogon.
[kai/samba.git] / source3 / rpc_client / cli_netlogon.c
index 54c6c7f23ecb3e28621182b06533bbbf5042ad78..a0a94578beac4979be33fcd5315e454971bf5d46 100644 (file)
-/* 
+/*
    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.
+   Copyright (C) Guenther Deschner                 2008.
 
    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"
-
-/* 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;
-
-       /* create and send a MSRPC command with api NET_REQCHAL */
-
-       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);
-
-       /* 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);
-
-       result = r.status;
-
-       /* Return result */
-
-       if (NT_STATUS_IS_OK(result)) {
-               /* Store the returned server challenge. */
-               *srv_chal_out = r.srv_chal;
-       }
-
-       return result;
-}
-
-#if 0
-/****************************************************************************
-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 rpccli_net_auth2(struct rpc_pipe_client *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;
-       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
-
- 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.
-****************************************************************************/
-
-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 qbuf, rbuf;
-        NET_Q_AUTH_2 q;
-        NET_R_AUTH_2 r;
-        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-        /* 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);
-
-        /* 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)) {
-               *srv_chal_out = r.srv_chal;
-               *neg_flags_inout = r.srv_flgs.neg_flags;
-        }
-
-        return result;
-}
-
-#if 0  /* not currebntly used */
-/****************************************************************************
- 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.
-****************************************************************************/
-
-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 qbuf, rbuf;
-        NET_Q_AUTH_3 q;
-        NET_R_AUTH_3 r;
-        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-        /* create and send a MSRPC command with api NET_AUTH2 */
-
-        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 */
+#include "rpc_client/rpc_client.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon_c.h"
+#include "rpc_client/cli_netlogon.h"
+#include "rpc_client/init_netlogon.h"
+#include "rpc_client/util_netlogon.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************************
  Wrapper function that uses the auth and auth2 calls to set up a NETLOGON
@@ -251,75 +36,93 @@ static NTSTATUS rpccli_net_auth3(struct rpc_pipe_client *cli,
 ****************************************************************************/
 
 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)
+                                    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)
 {
+       NTSTATUS status;
        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);
-
-       dc = cli->dc;
-       if (!dc) {
+       struct netr_Credential clnt_chal_send;
+       struct netr_Credential srv_chal_recv;
+       struct samr_Password password;
+       bool retried = false;
+       fstring mach_acct;
+       uint32_t neg_flags = *neg_flags_inout;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (!ndr_syntax_id_equal(&cli->abstract_syntax,
+                                &ndr_table_netlogon.syntax_id)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       /* Ensure we don't reuse any of this state. */
-       ZERO_STRUCTP(dc);
+       TALLOC_FREE(cli->dc);
 
        /* 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);
+       memcpy(password.hash, machine_pwd, 16);
 
-       fstr_sprintf( dc->mach_acct, "%s$", machine_account);
+       fstr_sprintf( mach_acct, "%s$", machine_account);
 
+ again:
        /* 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);
-
+       status = dcerpc_netr_ServerReqChallenge(b, talloc_tos(),
+                                               cli->srv_name_slash,
+                                               clnt_name,
+                                               &clnt_chal_send,
+                                               &srv_chal_recv,
+                                               &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
        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_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 */
+
+       cli->dc = netlogon_creds_client_init(cli,
+                                   mach_acct,
+                                   clnt_name,
+                                   &clnt_chal_send,
+                                   &srv_chal_recv,
+                                   &password,
+                                   &clnt_chal_send,
+                                   neg_flags);
+
+       if (!cli->dc) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /*
+        * Send client auth-2 challenge and receive server repy.
+        */
+
+       status = dcerpc_netr_ServerAuthenticate2(b, talloc_tos(),
+                                                cli->srv_name_slash,
+                                                cli->dc->account_name,
+                                                sec_chan_type,
+                                                cli->dc->computer_name,
+                                                &clnt_chal_send, /* input. */
+                                                &srv_chal_recv, /* output. */
+                                                &neg_flags,
+                                                &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+       /* we might be talking to NT4, so let's downgrade in that case and retry
+        * with the returned neg_flags - gd */
+
+       if (NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) && !retried) {
+               retried = true;
+               TALLOC_FREE(cli->dc);
+               goto again;
+       }
 
        if (!NT_STATUS_IS_OK(result)) {
                return result;
@@ -330,527 +133,226 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
         * server received challenge.
         */
 
-       if (!creds_client_check(dc, &srv_chal_recv)) {
+       if (!netlogon_creds_client_check(cli->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 ));
+                       cli->desthost ));
                return NT_STATUS_ACCESS_DENIED;
        }
 
        DEBUG(5,("rpccli_netlogon_setup_creds: server %s credential "
                "chain established.\n",
-               cli->cli->desthost ));
+               cli->desthost ));
+
+       cli->dc->negotiate_flags = neg_flags;
+       *neg_flags_inout = neg_flags;
 
        return NT_STATUS_OK;
 }
 
-/* Logon Control 2 */
+/* Logon domain user */
 
-NTSTATUS rpccli_netlogon_logon_ctrl2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                  uint32 query_level)
+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,
+                                  uint16_t validation_level,
+                                  int logon_type)
 {
-       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;
-}
-
-/* GetAnyDCName */
-
-WERROR rpccli_netlogon_getanydcname(struct rpc_pipe_client *cli,
-                                   TALLOC_CTX *mem_ctx, const char *mydcname,
-                                   const char *domainname, char **newdcname)
-{
-       prs_struct qbuf, rbuf;
-       NET_Q_GETANYDCNAME q;
-       NET_R_GETANYDCNAME r;
-       WERROR result;
-       fstring mydcname_slash;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise input parameters */
-
-       slprintf(mydcname_slash, sizeof(fstring)-1, "\\\\%s", mydcname);
-       init_net_q_getanydcname(&q, mydcname_slash, domainname);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC_WERR(cli, mem_ctx, PI_NETLOGON, NET_GETANYDCNAME,
-               q, r,
-               qbuf, rbuf,
-               net_io_q_getanydcname,
-               net_io_r_getanydcname,
-               WERR_GENERAL_FAILURE);
+       NTSTATUS status;
+       struct netr_Authenticator clnt_creds;
+       struct netr_Authenticator ret_creds;
+       union netr_LogonLevel *logon;
+       union netr_Validation validation;
+       uint8_t authoritative;
+       fstring clnt_name_slash;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
-       result = r.status;
+       ZERO_STRUCT(ret_creds);
 
-       if (W_ERROR_IS_OK(result) && newdcname) {
-               *newdcname = rpcstr_pull_unistr2_talloc(mem_ctx, &r.uni_dcname);
-               W_ERROR_HAVE_NO_MEMORY(*newdcname);
+       logon = talloc_zero(mem_ctx, union netr_LogonLevel);
+       if (!logon) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       return result;
-}
-
-/* GetDCName */
-
-WERROR rpccli_netlogon_getdcname(struct rpc_pipe_client *cli,
-                                TALLOC_CTX *mem_ctx, const char *mydcname,
-                                const char *domainname, char **newdcname)
-{
-       prs_struct qbuf, rbuf;
-       NET_Q_GETDCNAME q;
-       NET_R_GETDCNAME r;
-       WERROR result;
-       fstring mydcname_slash;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise input parameters */
-
-       slprintf(mydcname_slash, sizeof(fstring)-1, "\\\\%s", mydcname);
-       init_net_q_getdcname(&q, mydcname_slash, domainname);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC_WERR(cli, mem_ctx, PI_NETLOGON, NET_GETDCNAME,
-               q, r,
-               qbuf, rbuf,
-               net_io_q_getdcname,
-               net_io_r_getdcname,
-               WERR_GENERAL_FAILURE);
-
-       result = r.status;
-
-       if (W_ERROR_IS_OK(result) && newdcname) {
-               *newdcname = rpcstr_pull_unistr2_talloc(mem_ctx, &r.uni_dcname);
-               W_ERROR_HAVE_NO_MEMORY(*newdcname);
+       if (workstation) {
+               fstr_sprintf( clnt_name_slash, "\\\\%s", workstation );
+       } else {
+               fstr_sprintf( clnt_name_slash, "\\\\%s", lp_netbios_name() );
        }
 
-       return result;
-}
+       /* Initialise input parameters */
 
-static WERROR pull_domain_controller_info_from_getdcname_reply(TALLOC_CTX *mem_ctx,
-                                                              struct DS_DOMAIN_CONTROLLER_INFO **info_out, 
-                                                              NET_R_DSR_GETDCNAME *r)
-{
-       struct DS_DOMAIN_CONTROLLER_INFO *info;
+       netlogon_creds_client_authenticator(cli->dc, &clnt_creds);
 
-       info = TALLOC_ZERO_P(mem_ctx, struct DS_DOMAIN_CONTROLLER_INFO);
-       if (!info) {
-               return WERR_NOMEM;
-       }
+       switch (logon_type) {
+       case NetlogonInteractiveInformation: {
 
-       if (&r->uni_dc_unc) {
+               struct netr_PasswordInfo *password_info;
 
-               char *tmp;
-               tmp = rpcstr_pull_unistr2_talloc(mem_ctx, &r->uni_dc_unc);
-               if (tmp == NULL) {
-                       return WERR_GENERAL_FAILURE;
-               }
-               if (*tmp == '\\') tmp += 1;
-               if (*tmp == '\\') tmp += 1;
+               struct samr_Password lmpassword;
+               struct samr_Password ntpassword;
 
-               info->domain_controller_name = talloc_strdup(mem_ctx, tmp);
-               if (info->domain_controller_name == NULL) {
-                       return WERR_GENERAL_FAILURE;
+               password_info = talloc_zero(mem_ctx, struct netr_PasswordInfo);
+               if (!password_info) {
+                       return NT_STATUS_NO_MEMORY;
                }
-       }
-
-       if (&r->uni_dc_address) {
 
-               char *tmp;
-               tmp = rpcstr_pull_unistr2_talloc(mem_ctx, &r->uni_dc_address);
-               if (tmp == NULL) {
-                       return WERR_GENERAL_FAILURE;
+               nt_lm_owf_gen(password, ntpassword.hash, lmpassword.hash);
+
+               if (cli->dc->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
+                       netlogon_creds_aes_encrypt(cli->dc, lmpassword.hash, 16);
+                       netlogon_creds_aes_encrypt(cli->dc, ntpassword.hash, 16);
+               } else if (cli->dc->negotiate_flags & NETLOGON_NEG_ARCFOUR) {
+                       netlogon_creds_arcfour_crypt(cli->dc, lmpassword.hash, 16);
+                       netlogon_creds_arcfour_crypt(cli->dc, ntpassword.hash, 16);
+               } else {
+                       netlogon_creds_des_encrypt(cli->dc, &lmpassword);
+                       netlogon_creds_des_encrypt(cli->dc, &ntpassword);
                }
-               if (*tmp == '\\') tmp += 1;
-               if (*tmp == '\\') tmp += 1;
 
-               info->domain_controller_address = talloc_strdup(mem_ctx, tmp);
-               if (info->domain_controller_address == NULL) {
-                       return WERR_GENERAL_FAILURE;
-               }
-       }
+               password_info->identity_info.domain_name.string         = domain;
+               password_info->identity_info.parameter_control          = logon_parameters;
+               password_info->identity_info.logon_id_low               = 0xdead;
+               password_info->identity_info.logon_id_high              = 0xbeef;
+               password_info->identity_info.account_name.string        = username;
+               password_info->identity_info.workstation.string         = clnt_name_slash;
 
-       info->domain_controller_address_type = r->dc_address_type;
+               password_info->lmpassword = lmpassword;
+               password_info->ntpassword = ntpassword;
 
-       info->domain_guid = (struct GUID *)talloc_memdup(
-               mem_ctx, &r->domain_guid, sizeof(struct GUID));
-       if (!info->domain_guid) {
-               return WERR_GENERAL_FAILURE;
-       }
+               logon->password = password_info;
 
-       if (&r->uni_domain_name) {
-               info->domain_name = rpcstr_pull_unistr2_talloc(mem_ctx, &r->uni_domain_name);
-               if (!info->domain_name) {
-                       return WERR_GENERAL_FAILURE;
-               }
-       }
-
-       if (&r->uni_forest_name) {
-               info->dns_forest_name = rpcstr_pull_unistr2_talloc(mem_ctx, &r->uni_forest_name);
-               if (!info->dns_forest_name) {
-                       return WERR_GENERAL_FAILURE;
-               }
+               break;
        }
+       case NetlogonNetworkInformation: {
+               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;
 
-       info->flags = r->dc_flags;
+               ZERO_STRUCT(lm);
+               ZERO_STRUCT(nt);
 
-       if (&r->uni_dc_site_name) {
-               info->dc_site_name = rpcstr_pull_unistr2_talloc(mem_ctx, &r->uni_dc_site_name);
-               if (!info->dc_site_name) {
-                       return WERR_GENERAL_FAILURE;
+               network_info = talloc_zero(mem_ctx, struct netr_NetworkInfo);
+               if (!network_info) {
+                       return NT_STATUS_NO_MEMORY;
                }
-       }
 
-       if (&r->uni_client_site_name) {
-               info->client_site_name = rpcstr_pull_unistr2_talloc(mem_ctx, &r->uni_client_site_name);
-               if (!info->client_site_name) {
-                       return WERR_GENERAL_FAILURE;
-               }
-       }
+               generate_random_buffer(chal, 8);
 
-       *info_out = info;
+               SMBencrypt(password, chal, local_lm_response);
+               SMBNTencrypt(password, chal, local_nt_response);
 
-       return WERR_OK;
-}
+               lm.length = 24;
+               lm.data = local_lm_response;
 
-/* Dsr_GetDCName */
+               nt.length = 24;
+               nt.data = local_nt_response;
 
-WERROR rpccli_netlogon_dsr_getdcname(struct rpc_pipe_client *cli,
-                                    TALLOC_CTX *mem_ctx,
-                                    const char *server_name,
-                                    const char *domain_name,
-                                    struct GUID *domain_guid,
-                                    struct GUID *site_guid,
-                                    uint32_t flags,
-                                    struct DS_DOMAIN_CONTROLLER_INFO **info_out)
-{
-       prs_struct qbuf, rbuf;
-       NET_Q_DSR_GETDCNAME q;
-       NET_R_DSR_GETDCNAME r;
-       char *tmp_str;
+               network_info->identity_info.domain_name.string          = domain;
+               network_info->identity_info.parameter_control           = logon_parameters;
+               network_info->identity_info.logon_id_low                = 0xdead;
+               network_info->identity_info.logon_id_high               = 0xbeef;
+               network_info->identity_info.account_name.string         = username;
+               network_info->identity_info.workstation.string          = clnt_name_slash;
 
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
+               memcpy(network_info->challenge, chal, 8);
+               network_info->nt = nt;
+               network_info->lm = lm;
 
-       /* Initialize input parameters */
+               logon->network = network_info;
 
-       tmp_str = talloc_asprintf(mem_ctx, "\\\\%s", server_name);
-       if (tmp_str == NULL) {
-               return WERR_NOMEM;
+               break;
        }
-
-       init_net_q_dsr_getdcname(&q, tmp_str, domain_name, domain_guid,
-                                site_guid, flags);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC_WERR(cli, mem_ctx, PI_NETLOGON, NET_DSR_GETDCNAME,
-                       q, r,
-                       qbuf, rbuf,
-                       net_io_q_dsr_getdcname,
-                       net_io_r_dsr_getdcname,
-                       WERR_GENERAL_FAILURE);
-
-       if (!W_ERROR_IS_OK(r.result)) {
-               return r.result;
+       default:
+               DEBUG(0, ("switch value %d not supported\n",
+                       logon_type));
+               return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       r.result = pull_domain_controller_info_from_getdcname_reply(mem_ctx, info_out, &r);
-       if (!W_ERROR_IS_OK(r.result)) {
-               return r.result;
+       status = dcerpc_netr_LogonSamLogon(b, mem_ctx,
+                                          cli->srv_name_slash,
+                                          lp_netbios_name(),
+                                          &clnt_creds,
+                                          &ret_creds,
+                                          logon_type,
+                                          logon,
+                                          validation_level,
+                                          &validation,
+                                          &authoritative,
+                                          &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       return WERR_OK;
-}
-
-/* Dsr_GetSiteName */
-
-WERROR rpccli_netlogon_dsr_getsitename(struct rpc_pipe_client *cli,
-                                      TALLOC_CTX *mem_ctx,
-                                      const char *computer_name,
-                                      char **site_name)
-{
-       prs_struct qbuf, rbuf;
-       NET_Q_DSR_GETSITENAME q;
-       NET_R_DSR_GETSITENAME r;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialize input parameters */
-
-       init_net_q_dsr_getsitename(&q, computer_name);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC_WERR(cli, mem_ctx, PI_NETLOGON, NET_DSR_GETSITENAME,
-                       q, r,
-                       qbuf, rbuf,
-                       net_io_q_dsr_getsitename,
-                       net_io_r_dsr_getsitename,
-                       WERR_GENERAL_FAILURE);
-
-       if (!W_ERROR_IS_OK(r.result)) {
-               return r.result;
-       }
-
-       if ((site_name != NULL) &&
-           ((*site_name = rpcstr_pull_unistr2_talloc(
-                     mem_ctx, &r.uni_site_name)) == NULL)) {
-               return WERR_GENERAL_FAILURE;
-       }
-
-       return WERR_OK;
-}
-
-
-
-/* Sam synchronisation */
-
-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);
-
-       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_COPY_SESS_KEY(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;
-               }
+       /* Always check returned credentials */
+       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;
 }
 
-/* Sam synchronisation */
-
-NTSTATUS rpccli_netlogon_sam_deltas(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                 uint32 database_id, uint64 seqnum,
-                                 uint32 *num_deltas, 
-                                 SAM_DELTA_HDR **hdr_deltas, 
-                                 SAM_DELTA_CTR **deltas)
+static NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
+                                       uint16_t validation_level,
+                                       union netr_Validation *validation,
+                                       struct netr_SamInfo3 **info3_p)
 {
-       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);
+       struct netr_SamInfo3 *info3;
+       NTSTATUS status;
 
-       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;
-
-       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;
-               }
+       if (validation == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       return result;
-}
-
-/* Logon domain user */
+       switch (validation_level) {
+       case 3:
+               if (validation->sam3 == NULL) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
 
-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 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;
+               info3 = talloc_move(mem_ctx, &validation->sam3);
+               break;
+       case 6:
+               if (validation->sam6 == NULL) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
 
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-       ZERO_STRUCT(ret_creds);
+               info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
+               if (info3 == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               status = copy_netr_SamBaseInfo(info3, &validation->sam6->base, &info3->base);
+               if (!NT_STATUS_IS_OK(status)) {
+                       TALLOC_FREE(info3);
+                       return status;
+               }
 
-       if (workstation) {
-               fstr_sprintf( clnt_name_slash, "\\\\%s", workstation );
-       } else {
-               fstr_sprintf( clnt_name_slash, "\\\\%s", global_myname() );
+               info3->sidcount = validation->sam6->sidcount;
+               info3->sids = talloc_move(info3, &validation->sam6->sids);
+               break;
+       default:
+               return NT_STATUS_BAD_VALIDATION_CLASS;
        }
 
-        /* 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);
+       *info3_p = info3;
 
-                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;
+       return NT_STATUS_OK;
 }
 
-
-/** 
- * Logon domain user with an 'network' SAM logon 
+/**
+ * Logon domain user with an 'network' SAM logon
  *
  * @param info3 Pointer to a NET_USER_INFO_3 already allocated by the caller.
  **/
@@ -861,31 +363,45 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
                                           const char *server,
                                           const char *username,
                                           const char *domain,
-                                          const char *workstation, 
-                                          const uint8 chal[8], 
+                                          const char *workstation,
+                                          const uint8 chal[8],
+                                          uint16_t validation_level,
                                           DATA_BLOB lm_response,
                                           DATA_BLOB nt_response,
-                                          NET_USER_INFO_3 *info3)
+                                          struct netr_SamInfo3 **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;
+       NTSTATUS status;
        const char *workstation_name_slash;
        const char *server_name_slash;
-       uint8 zeros[16];
-       DOM_CRED clnt_creds;
-       DOM_CRED ret_creds;
-       int i;
-
-       ZERO_STRUCT(zeros);
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
+       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 dcerpc_binding_handle *b = cli->binding_handle;
+
+       *info3 = NULL;
+
        ZERO_STRUCT(ret_creds);
 
-       creds_client_step(cli->dc, &clnt_creds);
+       ZERO_STRUCT(lm);
+       ZERO_STRUCT(nt);
+
+       logon = talloc_zero(mem_ctx, union netr_LogonLevel);
+       if (!logon) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       network_info = talloc_zero(mem_ctx, struct netr_NetworkInfo);
+       if (!network_info) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       netlogon_creds_client_authenticator(cli->dc, &clnt_creds);
 
        if (server[0] != '\\' && server[1] != '\\') {
                server_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", server);
@@ -906,60 +422,59 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 
        /* Initialise input parameters */
 
-       q.validation_level = validation_level;
+       lm.data = lm_response.data;
+       lm.length = lm_response.length;
+       nt.data = nt_response.data;
+       nt.length = nt_response.length;
 
-        ctr.switch_value = NET_LOGON_TYPE;
+       network_info->identity_info.domain_name.string          = domain;
+       network_info->identity_info.parameter_control           = logon_parameters;
+       network_info->identity_info.logon_id_low                = 0xdead;
+       network_info->identity_info.logon_id_high               = 0xbeef;
+       network_info->identity_info.account_name.string         = username;
+       network_info->identity_info.workstation.string          = workstation_name_slash;
 
-       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);
+       memcpy(network_info->challenge, chal, 8);
+       network_info->nt = nt;
+       network_info->lm = lm;
 
-        r.user = info3;
+       logon->network = network_info;
 
-        /* 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);
+       /* Marshall data and send request */
 
-       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);
+       status = dcerpc_netr_LogonSamLogon(b, mem_ctx,
+                                          server_name_slash,
+                                          lp_netbios_name(),
+                                          &clnt_creds,
+                                          &ret_creds,
+                                          NetlogonNetworkInformation,
+                                          logon,
+                                          validation_level,
+                                          &validation,
+                                          &authoritative,
+                                          &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       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);
+       /* Always check returned credentials. */
+       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;
        }
 
-       for (i=0; i < 7; i++) {
-               memset(&info3->unknown[i], '\0', 4);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
        }
 
-        /* Return results */
-
-       result = r.status;
+       netlogon_creds_decrypt_samlogon(cli->dc, validation_level, &validation);
 
-       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;
-               }
+       result = map_validation_to_info3(mem_ctx, validation_level, &validation, info3);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
        }
 
-        return result;
+       return result;
 }
 
 NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
@@ -968,26 +483,40 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
                                              const char *server,
                                              const char *username,
                                              const char *domain,
-                                             const char *workstation, 
-                                             const uint8 chal[8], 
+                                             const char *workstation,
+                                             const uint8 chal[8],
+                                             uint16_t validation_level,
                                              DATA_BLOB lm_response,
                                              DATA_BLOB nt_response,
-                                             NET_USER_INFO_3 *info3)
+                                             struct netr_SamInfo3 **info3)
 {
-       prs_struct qbuf, rbuf;
-       NET_Q_SAM_LOGON_EX q;
-       NET_R_SAM_LOGON_EX r;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       NET_ID_INFO_CTR ctr;
-       int validation_level = 3;
+       NTSTATUS status;
        const char *workstation_name_slash;
        const char *server_name_slash;
-       uint8 zeros[16];
-       int i;
+       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;
+       uint32_t flags = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       *info3 = NULL;
+
+       ZERO_STRUCT(lm);
+       ZERO_STRUCT(nt);
+
+       logon = talloc_zero(mem_ctx, union netr_LogonLevel);
+       if (!logon) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       ZERO_STRUCT(zeros);
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
+       network_info = talloc_zero(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);
@@ -1008,97 +537,163 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
 
        /* Initialise input parameters */
 
-       q.validation_level = validation_level;
+       lm.data = lm_response.data;
+       lm.length = lm_response.length;
+       nt.data = nt_response.data;
+       nt.length = nt_response.length;
 
-        ctr.switch_value = NET_LOGON_TYPE;
+       network_info->identity_info.domain_name.string          = domain;
+       network_info->identity_info.parameter_control           = logon_parameters;
+       network_info->identity_info.logon_id_low                = 0xdead;
+       network_info->identity_info.logon_id_high               = 0xbeef;
+       network_info->identity_info.account_name.string         = username;
+       network_info->identity_info.workstation.string          = workstation_name_slash;
 
-       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_ex(&q.sam_id, server_name_slash, global_myname(),
-                        NET_LOGON_TYPE, &ctr);
+       memcpy(network_info->challenge, chal, 8);
+       network_info->nt = nt;
+       network_info->lm = lm;
 
-        r.user = info3;
+       logon->network = network_info;
 
         /* Marshall data and send request */
 
-       CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_SAMLOGON_EX,
-                  q, r, qbuf, rbuf,
-                  net_io_q_sam_logon_ex,
-                  net_io_r_sam_logon_ex,
-                  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);
+       status = dcerpc_netr_LogonSamLogonEx(b, mem_ctx,
+                                            server_name_slash,
+                                            lp_netbios_name(),
+                                            NetlogonNetworkInformation,
+                                            logon,
+                                            validation_level,
+                                            &validation,
+                                            &authoritative,
+                                            &flags,
+                                            &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       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);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
        }
 
-       for (i=0; i < 7; i++) {
-               memset(&info3->unknown[i], '\0', 4);
+       netlogon_creds_decrypt_samlogon(cli->dc, validation_level, &validation);
+
+       result = map_validation_to_info3(mem_ctx, validation_level, &validation, info3);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
        }
 
-        /* Return results */
+       return result;
+}
 
-       result = r.status;
+/*********************************************************
+ Change the domain password on the PDC.
 
-        return result;
-}
+ Just changes the password betwen the two values specified.
 
-/***************************************************************************
-LSA Server Password Set.
-****************************************************************************/
+ Caller must have the cli connected to the netlogon pipe
+ already.
+**********************************************************/
 
-NTSTATUS rpccli_net_srv_pwset(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
-                          const char *machine_name, const uint8 hashed_mach_pwd[16])
+NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
+                                           TALLOC_CTX *mem_ctx,
+                                           const char *account_name,
+                                           const unsigned char orig_trust_passwd_hash[16],
+                                           const char *new_trust_pwd_cleartext,
+                                           const unsigned char new_trust_passwd_hash[16],
+                                           enum netr_SchannelType sec_channel_type)
 {
-       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;
+       NTSTATUS result, status;
+       struct netr_Authenticator clnt_creds, srv_cred;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
+
+       if (!cli->dc) {
+               uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
+               result = rpccli_netlogon_setup_creds(cli,
+                                                    cli->desthost, /* server name */
+                                                    lp_workgroup(), /* domain */
+                                                    lp_netbios_name(), /* client name */
+                                                    account_name, /* machine account name */
+                                                    orig_trust_passwd_hash,
+                                                    sec_channel_type,
+                                                    &neg_flags);
+               if (!NT_STATUS_IS_OK(result)) {
+                       DEBUG(3,("rpccli_netlogon_set_trust_password: unable to setup creds (%s)!\n",
+                                nt_errstr(result)));
+                       return result;
+               }
+       }
 
-       if (!NT_STATUS_IS_OK(result)) {
-               /* report error code */
-               DEBUG(0,("cli_net_srv_pwset: %s\n", nt_errstr(result)));
+       netlogon_creds_client_authenticator(cli->dc, &clnt_creds);
+
+       if (cli->dc->negotiate_flags & NETLOGON_NEG_PASSWORD_SET2) {
+
+               struct netr_CryptPassword new_password;
+               uint32_t old_timeout;
+
+               init_netr_CryptPassword(new_trust_pwd_cleartext,
+                                       cli->dc,
+                                       &new_password);
+
+               old_timeout = dcerpc_binding_handle_set_timeout(b, 600000);
+
+               status = dcerpc_netr_ServerPasswordSet2(b, mem_ctx,
+                                                       cli->srv_name_slash,
+                                                       cli->dc->account_name,
+                                                       sec_channel_type,
+                                                       cli->dc->computer_name,
+                                                       &clnt_creds,
+                                                       &srv_cred,
+                                                       &new_password,
+                                                       &result);
+
+               dcerpc_binding_handle_set_timeout(b, old_timeout);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("dcerpc_netr_ServerPasswordSet2 failed: %s\n",
+                               nt_errstr(status)));
+                       return status;
+               }
+       } else {
+
+               struct samr_Password new_password;
+               uint32_t old_timeout;
+
+               memcpy(new_password.hash, new_trust_passwd_hash, sizeof(new_password.hash));
+               netlogon_creds_des_encrypt(cli->dc, &new_password);
+
+               old_timeout = dcerpc_binding_handle_set_timeout(b, 600000);
+
+               status = dcerpc_netr_ServerPasswordSet(b, mem_ctx,
+                                                      cli->srv_name_slash,
+                                                      cli->dc->account_name,
+                                                      sec_channel_type,
+                                                      cli->dc->computer_name,
+                                                      &clnt_creds,
+                                                      &srv_cred,
+                                                      &new_password,
+                                                      &result);
+
+               dcerpc_binding_handle_set_timeout(b, old_timeout);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0,("dcerpc_netr_ServerPasswordSet failed: %s\n",
+                               nt_errstr(status)));
+                       return status;
+               }
        }
 
        /* 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"));
+       if (!netlogon_creds_client_check(cli->dc, &srv_cred.cred)) {
+               DEBUG(0,("credentials chain check failed\n"));
                return NT_STATUS_ACCESS_DENIED;
        }
 
+       if (!NT_STATUS_IS_OK(result)) {
+               DEBUG(0,("dcerpc_netr_ServerPasswordSet{2} failed: %s\n",
+                       nt_errstr(result)));
+               return result;
+       }
+
        return result;
 }
+