cli_netlogon: Eliminate rpccli_setup_netlogon_creds_with_creds
[samba.git] / source3 / rpc_client / cli_netlogon.c
index b50a03359ebb4f26f8f9edce59b48c04ba63619c..2c3e205e2f4dbb39777acfb3487552118f6f4aca 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.
-*/
-
-/* instead of rpccli_net_req_chal() we use rpccli_netr_ServerReqChallenge() now - gd */
-
-#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)
+#include "system/filesys.h"
+#include "libsmb/libsmb.h"
+#include "rpc_client/rpc_client.h"
+#include "rpc_client/cli_pipe.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "../libcli/auth/netlogon_creds_cli.h"
+#include "../librpc/gen_ndr/ndr_netlogon_c.h"
+#include "../librpc/gen_ndr/schannel.h"
+#include "rpc_client/cli_netlogon.h"
+#include "rpc_client/init_netlogon.h"
+#include "rpc_client/util_netlogon.h"
+#include "../libcli/security/security.h"
+#include "lib/param/param.h"
+#include "libcli/smb/smbXcli_base.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
+#include "util_tdb.h"
+
+
+NTSTATUS rpccli_pre_open_netlogon_creds(void)
 {
-        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
+       static bool already_open = false;
+       TALLOC_CTX *frame;
+       struct loadparm_context *lp_ctx;
+       char *fname;
+       struct db_context *global_db;
+       NTSTATUS status;
+
+       if (already_open) {
+               return NT_STATUS_OK;
+       }
 
-/****************************************************************************
- LSA Authenticate 2
+       frame = talloc_stackframe();
 
- 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.
-****************************************************************************/
+       lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers());
+       if (lp_ctx == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-/* instead of rpccli_net_auth2() we use rpccli_netr_ServerAuthenticate2() now -  gd */
+       fname = lpcfg_private_db_path(frame, lp_ctx, "netlogon_creds_cli");
+       if (fname == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
 
+       global_db = db_open(frame, fname,
+                           0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+                           O_RDWR|O_CREAT, 0600, DBWRAP_LOCK_ORDER_2,
+                           DBWRAP_FLAG_OPTIMIZE_READONLY_ACCESS);
+       if (global_db == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-#if 0  /* not currebntly used */
-/****************************************************************************
- LSA Authenticate 3
+       status = netlogon_creds_cli_set_global_db(&global_db);
+       TALLOC_FREE(frame);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
- 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.
-****************************************************************************/
+       already_open = true;
+       return NT_STATUS_OK;
+}
 
-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)
+static NTSTATUS rpccli_create_netlogon_creds(
+       const char *server_computer,
+       const char *server_netbios_domain,
+       const char *server_dns_domain,
+       const char *client_account,
+       enum netr_SchannelType sec_chan_type,
+       struct messaging_context *msg_ctx,
+       TALLOC_CTX *mem_ctx,
+       struct netlogon_creds_cli_context **netlogon_creds)
 {
-        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);
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct loadparm_context *lp_ctx;
+       NTSTATUS status;
+
+       status = rpccli_pre_open_netlogon_creds();
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return status;
+       }
 
-        if (NT_STATUS_IS_OK(result)) {
-               *srv_chal_out = r.srv_chal;
-               *neg_flags_inout = r.srv_flgs.neg_flags;
-        }
+       lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers());
+       if (lp_ctx == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
+       status = netlogon_creds_cli_context_global(lp_ctx,
+                                                  msg_ctx,
+                                                  client_account,
+                                                  sec_chan_type,
+                                                  server_computer,
+                                                  server_netbios_domain,
+                                                  server_dns_domain,
+                                                  mem_ctx, netlogon_creds);
+       TALLOC_FREE(frame);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-        return result;
+       return NT_STATUS_OK;
 }
-#endif         /* not currebntly used */
-
-/****************************************************************************
- Wrapper function that uses the auth and auth2 calls to set up a NETLOGON
- credentials chain. Stores the credentials in the struct dcinfo in the
- netlogon pipe struct.
-****************************************************************************/
-
-NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
-                                    const char *server_name,
-                                    const char *domain,
-                                    const char *clnt_name,
-                                    const char *machine_account,
-                                    const unsigned char machine_pwd[16],
-                                    enum netr_SchannelType sec_chan_type,
-                                    uint32_t *neg_flags_inout)
-{
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       struct netr_Credential clnt_chal_send;
-       struct netr_Credential srv_chal_recv;
-       struct dcinfo *dc;
 
-       SMB_ASSERT(cli->pipe_idx == PI_NETLOGON);
-
-       dc = cli->dc;
-       if (!dc) {
-               return NT_STATUS_INVALID_PARAMETER;
+NTSTATUS rpccli_create_netlogon_creds_ctx(
+       struct cli_credentials *creds,
+       const char *server_computer,
+       struct messaging_context *msg_ctx,
+       TALLOC_CTX *mem_ctx,
+       struct netlogon_creds_cli_context **netlogon_creds)
+{
+       enum netr_SchannelType sec_chan_type;
+       const char *server_netbios_domain;
+       const char *server_dns_domain;
+       const char *client_account;
+
+       sec_chan_type = cli_credentials_get_secure_channel_type(creds);
+       if (sec_chan_type == SEC_CHAN_NULL) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
        }
 
-       /* Ensure we don't reuse any of this state. */
-       ZERO_STRUCTP(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);
+       client_account = cli_credentials_get_username(creds);
+       server_netbios_domain = cli_credentials_get_domain(creds);
+       server_dns_domain = cli_credentials_get_realm(creds);
+
+       return rpccli_create_netlogon_creds(server_computer,
+                                           server_netbios_domain,
+                                           server_dns_domain,
+                                           client_account,
+                                           sec_chan_type,
+                                           msg_ctx, mem_ctx,
+                                           netlogon_creds);
+}
 
-       fstrcpy(dc->domain, domain);
+NTSTATUS rpccli_setup_netlogon_creds(
+       struct cli_state *cli,
+       enum dcerpc_transport_t transport,
+       struct netlogon_creds_cli_context *netlogon_creds,
+       bool force_reauth,
+       struct cli_credentials *cli_creds)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct rpc_pipe_client *netlogon_pipe = NULL;
+       struct netlogon_creds_CredentialState *creds = NULL;
+       uint8_t num_nt_hashes = 0;
+       const struct samr_Password *nt_hashes[2] = { NULL, NULL };
+       uint8_t idx_nt_hashes = 0;
+       NTSTATUS status;
+
+       status = netlogon_creds_cli_get(netlogon_creds,
+                                       frame, &creds);
+       if (NT_STATUS_IS_OK(status)) {
+               const char *action = "using";
+
+               if (force_reauth) {
+                       action = "overwrite";
+               }
 
-       fstr_sprintf( dc->mach_acct, "%s$", machine_account);
+               DEBUG(5,("%s: %s cached netlogon_creds cli[%s/%s] to %s\n",
+                        __FUNCTION__, action,
+                        creds->account_name, creds->computer_name,
+                        smbXcli_conn_remote_name(cli->conn)));
+               if (!force_reauth) {
+                       TALLOC_FREE(frame);
+                       return NT_STATUS_OK;
+               }
+               TALLOC_FREE(creds);
+       }
 
-       /* Create the client challenge. */
-       generate_random_buffer(clnt_chal_send.data, 8);
+       nt_hashes[0] = cli_credentials_get_nt_hash(cli_creds, talloc_tos());
+       if (nt_hashes[0] == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
+       num_nt_hashes = 1;
 
-       /* Get the server challenge. */
-       result = rpccli_netr_ServerReqChallenge(cli, cli->mem_ctx,
-                                               dc->remote_machine,
-                                               clnt_name,
-                                               &clnt_chal_send,
-                                               &srv_chal_recv);
-       if (!NT_STATUS_IS_OK(result)) {
-               return result;
+       nt_hashes[1] = cli_credentials_get_old_nt_hash(cli_creds,
+                                                      talloc_tos());
+       if (nt_hashes[1] != NULL) {
+               num_nt_hashes = 2;
        }
 
-       /* Calculate the session key and client credentials */
-       creds_client_init(*neg_flags_inout,
-                       dc,
-                       &clnt_chal_send,
-                       &srv_chal_recv,
-                       machine_pwd,
-                       &clnt_chal_send);
-
-        /*
-         * Send client auth-2 challenge and receive server repy.
-         */
-
-       result = rpccli_netr_ServerAuthenticate2(cli, cli->mem_ctx,
-                                                dc->remote_machine,
-                                                dc->mach_acct,
-                                                sec_chan_type,
-                                                clnt_name,
-                                                &clnt_chal_send, /* input. */
-                                                &srv_chal_recv, /* output. */
-                                                neg_flags_inout);
-       if (!NT_STATUS_IS_OK(result)) {
-               return result;
+       status = cli_rpc_pipe_open_noauth_transport(cli,
+                                                   transport,
+                                                   &ndr_table_netlogon,
+                                                   &netlogon_pipe);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5,("%s: failed to open noauth netlogon connection to %s - %s\n",
+                        __FUNCTION__,
+                        smbXcli_conn_remote_name(cli->conn),
+                        nt_errstr(status)));
+               TALLOC_FREE(frame);
+               return status;
+       }
+       talloc_steal(frame, netlogon_pipe);
+
+       status = netlogon_creds_cli_auth(netlogon_creds,
+                                        netlogon_pipe->binding_handle,
+                                        num_nt_hashes,
+                                        nt_hashes,
+                                        &idx_nt_hashes);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return status;
        }
 
-       /*
-        * Check the returned value using the initial
-        * server received challenge.
-        */
-
-       if (!netlogon_creds_client_check(dc, &srv_chal_recv)) {
-               /*
-                * Server replied with bad credential. Fail.
-                */
-               DEBUG(0,("rpccli_netlogon_setup_creds: server %s "
-                       "replied with bad credential\n",
-                       cli->cli->desthost ));
-               return NT_STATUS_ACCESS_DENIED;
+       status = netlogon_creds_cli_get(netlogon_creds,
+                                       frame, &creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_INTERNAL_ERROR;
        }
 
-       DEBUG(5,("rpccli_netlogon_setup_creds: server %s credential "
-               "chain established.\n",
-               cli->cli->desthost ));
+       DEBUG(5,("%s: using new netlogon_creds cli[%s/%s] to %s\n",
+                __FUNCTION__,
+                creds->account_name, creds->computer_name,
+                smbXcli_conn_remote_name(cli->conn)));
 
+       TALLOC_FREE(frame);
        return NT_STATUS_OK;
 }
 
-/* Logon domain user */
-
-NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
-                                  TALLOC_CTX *mem_ctx,
-                                  uint32 logon_parameters,
-                                  const char *domain,
-                                  const char *username,
-                                  const char *password,
-                                  const char *workstation,
-                                  int logon_type)
+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_LOGON q;
-       NET_R_SAM_LOGON r;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_CRED clnt_creds;
-       DOM_CRED ret_creds;
-        NET_ID_INFO_CTR ctr;
-        NET_USER_INFO_3 user;
-        int validation_level = 3;
-       fstring clnt_name_slash;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-       ZERO_STRUCT(ret_creds);
-
-       if (workstation) {
-               fstr_sprintf( clnt_name_slash, "\\\\%s", workstation );
-       } else {
-               fstr_sprintf( clnt_name_slash, "\\\\%s", global_myname() );
-       }
-
-        /* Initialise input parameters */
-
-       creds_client_step(cli->dc, &clnt_creds);
+       struct netr_SamInfo3 *info3;
+       NTSTATUS status;
 
-        q.validation_level = validation_level;
+       if (validation == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-        ctr.switch_value = logon_type;
+       switch (validation_level) {
+       case 3:
+               if (validation->sam3 == NULL) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
 
-        switch (logon_type) {
-        case INTERACTIVE_LOGON_TYPE: {
-                unsigned char lm_owf_user_pwd[16], nt_owf_user_pwd[16];
+               info3 = talloc_move(mem_ctx, &validation->sam3);
+               break;
+       case 6:
+               if (validation->sam6 == NULL) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
 
-                nt_lm_owf_gen(password, nt_owf_user_pwd, lm_owf_user_pwd);
+               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;
+               }
 
-                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);
+               info3->sidcount = validation->sam6->sidcount;
+               info3->sids = talloc_move(info3, &validation->sam6->sids);
+               break;
+       default:
+               return NT_STATUS_BAD_VALIDATION_CLASS;
+       }
 
-                break;
-        }
-        case NET_LOGON_TYPE: {
-                uint8 chal[8];
-                unsigned char local_lm_response[24];
-                unsigned char local_nt_response[24];
+       *info3_p = info3;
 
-                generate_random_buffer(chal, 8);
+       return NT_STATUS_OK;
+}
 
-                SMBencrypt(password, chal, local_lm_response);
-                SMBNTencrypt(password, chal, local_nt_response);
+/* Logon domain user */
 
-                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;
-        }
+NTSTATUS rpccli_netlogon_password_logon(struct netlogon_creds_cli_context *creds,
+                                       struct dcerpc_binding_handle *binding_handle,
+                                       TALLOC_CTX *mem_ctx,
+                                       uint32_t logon_parameters,
+                                       const char *domain,
+                                       const char *username,
+                                       const char *password,
+                                       const char *workstation,
+                                       enum netr_LogonInfoClass logon_type,
+                                       uint8_t *authoritative,
+                                       uint32_t *flags,
+                                       struct netr_SamInfo3 **info3)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       NTSTATUS status;
+       union netr_LogonLevel *logon;
+       uint16_t validation_level = 0;
+       union netr_Validation *validation = NULL;
+       char *workstation_slash = NULL;
+
+       logon = talloc_zero(frame, union netr_LogonLevel);
+       if (logon == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-        r.user = &user;
+       if (workstation == NULL) {
+               workstation = lp_netbios_name();
+       }
 
-        init_sam_info(&q.sam_id, cli->dc->remote_machine, global_myname(),
-                      &clnt_creds, &ret_creds, logon_type,
-                      &ctr);
+       workstation_slash = talloc_asprintf(frame, "\\\\%s", workstation);
+       if (workstation_slash == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-        /* Marshall data and send request */
+       /* Initialise input parameters */
 
-       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);
+       switch (logon_type) {
+       case NetlogonInteractiveInformation: {
 
-        /* Return results */
+               struct netr_PasswordInfo *password_info;
 
-       result = r.status;
+               struct samr_Password lmpassword;
+               struct samr_Password ntpassword;
 
-       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;
+               password_info = talloc_zero(frame, struct netr_PasswordInfo);
+               if (password_info == NULL) {
+                       TALLOC_FREE(frame);
+                       return NT_STATUS_NO_MEMORY;
                }
-       }
-
-        return result;
-}
-
-
-/** 
- * Logon domain user with an 'network' SAM logon 
- *
- * @param info3 Pointer to a NET_USER_INFO_3 already allocated by the caller.
- **/
 
-NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
-                                          TALLOC_CTX *mem_ctx,
-                                          uint32 logon_parameters,
-                                          const char *server,
-                                          const char *username,
-                                          const char *domain,
-                                          const char *workstation, 
-                                          const uint8 chal[8], 
-                                          DATA_BLOB lm_response,
-                                          DATA_BLOB nt_response,
-                                          NET_USER_INFO_3 *info3)
-{
-       prs_struct qbuf, rbuf;
-       NET_Q_SAM_LOGON q;
-       NET_R_SAM_LOGON r;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       NET_ID_INFO_CTR ctr;
-       int validation_level = 3;
-       const char *workstation_name_slash;
-       const char *server_name_slash;
-       uint8 zeros[16];
-       DOM_CRED clnt_creds;
-       DOM_CRED ret_creds;
-       int i;
+               nt_lm_owf_gen(password, ntpassword.hash, lmpassword.hash);
 
-       ZERO_STRUCT(zeros);
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-       ZERO_STRUCT(ret_creds);
+               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         = workstation_slash;
 
-       creds_client_step(cli->dc, &clnt_creds);
+               password_info->lmpassword = lmpassword;
+               password_info->ntpassword = ntpassword;
 
-       if (server[0] != '\\' && server[1] != '\\') {
-               server_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", server);
-       } else {
-               server_name_slash = server;
-       }
+               logon->password = password_info;
 
-       if (workstation[0] != '\\' && workstation[1] != '\\') {
-               workstation_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", workstation);
-       } else {
-               workstation_name_slash = workstation;
-       }
-
-       if (!workstation_name_slash || !server_name_slash) {
-               DEBUG(0, ("talloc_asprintf failed!\n"));
-               return NT_STATUS_NO_MEMORY;
+               break;
        }
+       case NetlogonNetworkInformation: {
+               struct netr_NetworkInfo *network_info;
+               uint8_t chal[8];
+               unsigned char local_lm_response[24];
+               unsigned char local_nt_response[24];
+               struct netr_ChallengeResponse lm;
+               struct netr_ChallengeResponse nt;
+
+               ZERO_STRUCT(lm);
+               ZERO_STRUCT(nt);
+
+               network_info = talloc_zero(frame, struct netr_NetworkInfo);
+               if (network_info == NULL) {
+                       TALLOC_FREE(frame);
+                       return NT_STATUS_NO_MEMORY;
+               }
 
-       /* Initialise input parameters */
+               generate_random_buffer(chal, 8);
 
-       q.validation_level = validation_level;
+               SMBencrypt(password, chal, local_lm_response);
+               SMBNTencrypt(password, chal, local_nt_response);
 
-        ctr.switch_value = NET_LOGON_TYPE;
+               lm.length = 24;
+               lm.data = local_lm_response;
 
-       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);
+               nt.length = 24;
+               nt.data = local_nt_response;
 
-        r.user = info3;
+               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_slash;
 
-        /* Marshall data and send request */
+               memcpy(network_info->challenge, chal, 8);
+               network_info->nt = nt;
+               network_info->lm = lm;
 
-       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);
+               logon->network = network_info;
 
-       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);
+               break;
+       }
+       default:
+               DEBUG(0, ("switch value %d not supported\n",
+                       logon_type));
+               TALLOC_FREE(frame);
+               return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       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);
+       status = netlogon_creds_cli_LogonSamLogon(creds,
+                                                 binding_handle,
+                                                 logon_type,
+                                                 logon,
+                                                 frame,
+                                                 &validation_level,
+                                                 &validation,
+                                                 authoritative,
+                                                 flags);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return status;
        }
 
-       for (i=0; i < 7; i++) {
-               memset(&info3->unknown[i], '\0', 4);
+       status = map_validation_to_info3(mem_ctx,
+                                        validation_level, validation,
+                                        info3);
+       TALLOC_FREE(frame);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-        /* Return results */
 
-       result = r.status;
+       return NT_STATUS_OK;
+}
 
-       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;
-               }
-       }
+/**
+ * Logon domain user with an 'network' SAM logon
+ *
+ * @param info3 Pointer to a NET_USER_INFO_3 already allocated by the caller.
+ **/
 
-        return result;
-}
 
-NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
-                                             TALLOC_CTX *mem_ctx,
-                                             uint32 logon_parameters,
-                                             const char *server,
-                                             const char *username,
-                                             const char *domain,
-                                             const char *workstation, 
-                                             const uint8 chal[8], 
-                                             DATA_BLOB lm_response,
-                                             DATA_BLOB nt_response,
-                                             NET_USER_INFO_3 *info3)
+NTSTATUS rpccli_netlogon_network_logon(struct netlogon_creds_cli_context *creds,
+                                      struct dcerpc_binding_handle *binding_handle,
+                                      TALLOC_CTX *mem_ctx,
+                                      uint32_t logon_parameters,
+                                      const char *username,
+                                      const char *domain,
+                                      const char *workstation,
+                                      const uint8_t chal[8],
+                                      DATA_BLOB lm_response,
+                                      DATA_BLOB nt_response,
+                                      uint8_t *authoritative,
+                                      uint32_t *flags,
+                                      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;
+       uint16_t validation_level = 0;
+       union netr_Validation *validation = NULL;
+       struct netr_ChallengeResponse lm;
+       struct netr_ChallengeResponse nt;
 
-       ZERO_STRUCT(zeros);
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
+       *info3 = NULL;
 
-       if (server[0] != '\\' && server[1] != '\\') {
-               server_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", server);
-       } else {
-               server_name_slash = server;
+       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;
        }
 
        if (workstation[0] != '\\' && workstation[1] != '\\') {
@@ -524,56 +489,52 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
                workstation_name_slash = workstation;
        }
 
-       if (!workstation_name_slash || !server_name_slash) {
+       if (!workstation_name_slash) {
                DEBUG(0, ("talloc_asprintf failed!\n"));
                return NT_STATUS_NO_MEMORY;
        }
 
        /* Initialise input parameters */
 
-       q.validation_level = validation_level;
-
-        ctr.switch_value = NET_LOGON_TYPE;
-
-       init_id_info2(&ctr.auth.id2, domain,
-                     logon_parameters, /* param_ctrl */
-                     0xdead, 0xbeef, /* LUID? */
-                     username, workstation_name_slash, (const uchar*)chal,
-                     lm_response.data, lm_response.length, nt_response.data,
-                     nt_response.length);
-        init_sam_info_ex(&q.sam_id, server_name_slash, global_myname(),
-                        NET_LOGON_TYPE, &ctr);
-
-        r.user = info3;
-
-        /* 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);
-       }
-
-       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);
+       lm.data = lm_response.data;
+       lm.length = lm_response.length;
+       nt.data = nt_response.data;
+       nt.length = nt_response.length;
+
+       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;
+
+       memcpy(network_info->challenge, chal, 8);
+       network_info->nt = nt;
+       network_info->lm = lm;
+
+       logon->network = network_info;
+
+       /* Marshall data and send request */
+
+       status = netlogon_creds_cli_LogonSamLogon(creds,
+                                                 binding_handle,
+                                                 NetlogonNetworkInformation,
+                                                 logon,
+                                                 mem_ctx,
+                                                 &validation_level,
+                                                 &validation,
+                                                 authoritative,
+                                                 flags);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       for (i=0; i < 7; i++) {
-               memset(&info3->unknown[i], '\0', 4);
+       status = map_validation_to_info3(mem_ctx,
+                                        validation_level, validation,
+                                        info3);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-        /* Return results */
-
-       result = r.status;
-
-        return result;
+       return NT_STATUS_OK;
 }