s3/rpc_client: make map_validation_to_info3() public and move to util_netlogon
[metze/samba/wip.git] / source3 / rpc_client / cli_netlogon.c
index 89aec37d67d3f586ca072e9a6b027e9e10f3d79e..67c87354e694f3a549b9578ca3fd618dff766090 100644 (file)
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libsmb/libsmb.h"
 #include "rpc_client/rpc_client.h"
 #include "rpc_client/cli_pipe.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"
 
-/****************************************************************************
- 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 rpccli_pre_open_netlogon_creds(void)
 {
-       TALLOC_CTX *frame = talloc_stackframe();
+       static bool already_open = false;
+       TALLOC_CTX *frame;
        struct loadparm_context *lp_ctx;
+       char *fname;
+       struct db_context *global_db;
        NTSTATUS status;
-       struct samr_Password password;
-       fstring mach_acct;
-       struct dcerpc_binding_handle *b = cli->binding_handle;
-       struct netlogon_creds_CredentialState *creds = NULL;
-
-       if (!ndr_syntax_id_equal(&cli->abstract_syntax,
-                                &ndr_table_netlogon.syntax_id)) {
-               TALLOC_FREE(frame);
-               return NT_STATUS_INVALID_PARAMETER;
-       }
 
-       if (!strequal(lp_netbios_name(), clnt_name)) {
-               TALLOC_FREE(frame);
-               return NT_STATUS_INVALID_PARAMETER;
+       if (already_open) {
+               return NT_STATUS_OK;
        }
 
-       TALLOC_FREE(cli->netlogon_creds);
-
-       fstr_sprintf( mach_acct, "%s$", machine_account);
+       frame = talloc_stackframe();
 
        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,
-                                                  NULL, /* msg_ctx */
-                                                  mach_acct,
-                                                  sec_chan_type,
-                                                  server_name,
-                                                  domain,
-                                                  cli, &cli->netlogon_creds);
-       talloc_unlink(frame, lp_ctx);
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(frame);
-               return status;
-       }
 
-       status = netlogon_creds_cli_get(cli->netlogon_creds,
-                                       frame, &creds);
-       if (NT_STATUS_IS_OK(status)) {
-               DEBUG(5,("rpccli_netlogon_setup_creds: server %s using "
-                        "cached credential\n",
-                        cli->desthost));
-               *neg_flags_inout = creds->negotiate_flags;
+       fname = lpcfg_private_db_path(frame, lp_ctx, "netlogon_creds_cli");
+       if (fname == NULL) {
                TALLOC_FREE(frame);
-               return NT_STATUS_OK;
+               return NT_STATUS_NO_MEMORY;
        }
 
-       /* Store the machine account password we're going to use. */
-       memcpy(password.hash, machine_pwd, 16);
-
-       DEBUG(5,("rpccli_netlogon_setup_creds: server %s credential "
-               "chain established.\n",
-               cli->desthost ));
-
-       status = netlogon_creds_cli_auth(cli->netlogon_creds, b,
-                                        password, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
+       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 status;
+               return NT_STATUS_NO_MEMORY;
        }
 
-       status = netlogon_creds_cli_get(cli->netlogon_creds,
-                                       frame, &creds);
+       status = netlogon_creds_cli_set_global_db(&global_db);
+       TALLOC_FREE(frame);
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(frame);
-               return NT_STATUS_INTERNAL_ERROR;
+               return status;
        }
 
-       *neg_flags_inout = creds->negotiate_flags;
-       TALLOC_FREE(frame);
+       already_open = true;
        return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_create_netlogon_creds(const char *server_computer,
-                                     const char *server_netbios_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)
+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)
 {
        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;
+       }
+
        lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers());
        if (lp_ctx == NULL) {
                TALLOC_FREE(frame);
@@ -151,6 +117,7 @@ NTSTATUS rpccli_create_netlogon_creds(const char *server_computer,
                                                   sec_chan_type,
                                                   server_computer,
                                                   server_netbios_domain,
+                                                  server_dns_domain,
                                                   mem_ctx, netlogon_creds);
        TALLOC_FREE(frame);
        if (!NT_STATUS_IS_OK(status)) {
@@ -160,19 +127,49 @@ NTSTATUS rpccli_create_netlogon_creds(const char *server_computer,
        return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_setup_netlogon_creds(struct cli_state *cli,
-                                    struct netlogon_creds_cli_context *netlogon_creds,
-                                    bool force_reauth,
-                                    struct samr_Password current_nt_hash,
-                                    const struct samr_Password *previous_nt_hash)
+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 **creds_ctx)
+{
+       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);
+       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,
+                                           creds_ctx);
+}
+
+NTSTATUS rpccli_setup_netlogon_creds_locked(
+       struct cli_state *cli,
+       enum dcerpc_transport_t transport,
+       struct netlogon_creds_cli_context *creds_ctx,
+       bool force_reauth,
+       struct cli_credentials *cli_creds,
+       uint32_t *negotiate_flags)
 {
        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);
+       status = netlogon_creds_cli_get(creds_ctx, frame, &creds);
        if (NT_STATUS_IS_OK(status)) {
                const char *action = "using";
 
@@ -185,15 +182,28 @@ NTSTATUS rpccli_setup_netlogon_creds(struct cli_state *cli,
                         creds->account_name, creds->computer_name,
                         smbXcli_conn_remote_name(cli->conn)));
                if (!force_reauth) {
-                       TALLOC_FREE(frame);
-                       return NT_STATUS_OK;
+                       goto done;
                }
                TALLOC_FREE(creds);
        }
 
-       status = cli_rpc_pipe_open_noauth(cli,
-                                         &ndr_table_netlogon,
-                                         &netlogon_pipe);
+       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;
+
+       nt_hashes[1] = cli_credentials_get_old_nt_hash(cli_creds,
+                                                      talloc_tos());
+       if (nt_hashes[1] != NULL) {
+               num_nt_hashes = 2;
+       }
+
+       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__,
@@ -204,17 +214,17 @@ NTSTATUS rpccli_setup_netlogon_creds(struct cli_state *cli,
        }
        talloc_steal(frame, netlogon_pipe);
 
-       status = netlogon_creds_cli_auth(netlogon_creds,
+       status = netlogon_creds_cli_auth(creds_ctx,
                                         netlogon_pipe->binding_handle,
-                                        current_nt_hash,
-                                        previous_nt_hash);
+                                        num_nt_hashes,
+                                        nt_hashes,
+                                        &idx_nt_hashes);
        if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(frame);
                return status;
        }
 
-       status = netlogon_creds_cli_get(netlogon_creds,
-                                       frame, &creds);
+       status = netlogon_creds_cli_get(creds_ctx, frame, &creds);
        if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(frame);
                return NT_STATUS_INTERNAL_ERROR;
@@ -225,39 +235,255 @@ NTSTATUS rpccli_setup_netlogon_creds(struct cli_state *cli,
                 creds->account_name, creds->computer_name,
                 smbXcli_conn_remote_name(cli->conn)));
 
+done:
+       if (negotiate_flags != NULL) {
+               *negotiate_flags = creds->negotiate_flags;
+       }
+
        TALLOC_FREE(frame);
        return NT_STATUS_OK;
 }
 
+NTSTATUS rpccli_setup_netlogon_creds(
+       struct cli_state *cli,
+       enum dcerpc_transport_t transport,
+       struct netlogon_creds_cli_context *creds_ctx,
+       bool force_reauth,
+       struct cli_credentials *cli_creds)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct netlogon_creds_cli_lck *lck;
+       NTSTATUS status;
+
+       status = netlogon_creds_cli_lck(
+               creds_ctx, NETLOGON_CREDS_CLI_LCK_EXCLUSIVE,
+               frame, &lck);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_WARNING("netlogon_creds_cli_lck failed: %s\n",
+                           nt_errstr(status));
+               TALLOC_FREE(frame);
+               return status;
+       }
+
+       status = rpccli_setup_netlogon_creds_locked(
+               cli, transport, creds_ctx, force_reauth, cli_creds, NULL);
+
+       TALLOC_FREE(frame);
+
+       return status;
+}
+
+NTSTATUS rpccli_connect_netlogon(
+       struct cli_state *cli,
+       enum dcerpc_transport_t transport,
+       struct netlogon_creds_cli_context *creds_ctx,
+       bool force_reauth,
+       struct cli_credentials *trust_creds,
+       struct rpc_pipe_client **_rpccli)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct netlogon_creds_CredentialState *creds = NULL;
+       enum netlogon_creds_cli_lck_type lck_type;
+       enum netr_SchannelType sec_chan_type;
+       struct netlogon_creds_cli_lck *lck = NULL;
+       uint32_t negotiate_flags;
+       uint8_t found_session_key[16] = {0};
+       bool found_existing_creds = false;
+       bool do_serverauth;
+       struct rpc_pipe_client *rpccli;
+       NTSTATUS status;
+       bool retry = false;
+
+       sec_chan_type = cli_credentials_get_secure_channel_type(trust_creds);
+       if (sec_chan_type == SEC_CHAN_NULL) {
+               DBG_ERR("secure_channel_type gave SEC_CHAN_NULL\n");
+               status = NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+               goto fail;
+       }
+
+again:
+
+       /*
+        * See whether we can use existing netlogon_creds or
+        * whether we have to serverauthenticate.
+        */
+       status = netlogon_creds_cli_get(creds_ctx, frame, &creds);
+
+       if (NT_STATUS_IS_OK(status)) {
+               int cmp = memcmp(found_session_key,
+                                creds->session_key,
+                                sizeof(found_session_key));
+               found_existing_creds = (cmp != 0);
+
+               memcpy(found_session_key,
+                      creds->session_key,
+                      sizeof(found_session_key));
+
+               TALLOC_FREE(creds);
+       }
+
+       lck_type = (force_reauth || !found_existing_creds) ?
+               NETLOGON_CREDS_CLI_LCK_EXCLUSIVE :
+               NETLOGON_CREDS_CLI_LCK_SHARED;
+
+       status = netlogon_creds_cli_lck(creds_ctx, lck_type, frame, &lck);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_DEBUG("netlogon_creds_cli_lck failed: %s\n",
+                         nt_errstr(status));
+               goto fail;
+       }
+
+       if (!found_existing_creds) {
+               /*
+                * Try to find creds under the lock again. Someone
+                * else might have done it for us.
+                */
+               status = netlogon_creds_cli_get(creds_ctx, frame, &creds);
+
+               if (NT_STATUS_IS_OK(status)) {
+                       int cmp = memcmp(found_session_key,
+                                        creds->session_key,
+                                        sizeof(found_session_key));
+                       found_existing_creds = (cmp != 0);
+
+                       memcpy(found_session_key, creds->session_key,
+                              sizeof(found_session_key));
+
+                       TALLOC_FREE(creds);
+               }
+       }
+
+       do_serverauth = force_reauth || !found_existing_creds;
+
+       if (!do_serverauth) {
+               /*
+                * Do the quick schannel bind without a reauth
+                */
+               status = cli_rpc_pipe_open_bind_schannel(
+                       cli, &ndr_table_netlogon, transport, creds_ctx,
+                       &rpccli);
+               if (!retry && NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_ACCESS_DENIED)) {
+                       DBG_DEBUG("Retrying with serverauthenticate\n");
+                       TALLOC_FREE(lck);
+                       retry = true;
+                       goto again;
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       DBG_DEBUG("cli_rpc_pipe_open_bind_schannel "
+                                 "failed: %s\n", nt_errstr(status));
+                       goto fail;
+               }
+               goto done;
+       }
+
+       if (cli_credentials_is_anonymous(trust_creds)) {
+               DBG_WARNING("get_trust_credential for %s only gave anonymous,"
+                           "unable to negotiate NETLOGON credentials\n",
+                           netlogon_creds_cli_debug_string(
+                                   creds_ctx, frame));
+               status = NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+               goto fail;
+       }
+
+       status = rpccli_setup_netlogon_creds_locked(
+               cli, transport, creds_ctx, true, trust_creds,
+               &negotiate_flags);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_DEBUG("rpccli_setup_netlogon_creds failed for %s, "
+                         "unable to setup NETLOGON credentials: %s\n",
+                         netlogon_creds_cli_debug_string(
+                                 creds_ctx, frame),
+                         nt_errstr(status));
+               goto fail;
+       }
+
+       if (!(negotiate_flags & NETLOGON_NEG_AUTHENTICATED_RPC)) {
+               if (lp_winbind_sealed_pipes() || lp_require_strong_key()) {
+                       status = NT_STATUS_DOWNGRADE_DETECTED;
+                       DBG_WARNING("Unwilling to make connection to %s"
+                                   "without connection level security, "
+                                   "must set 'winbind sealed pipes = false'"
+                                   " and 'require strong key = false' "
+                                   "to proceed: %s\n",
+                                   netlogon_creds_cli_debug_string(
+                                           creds_ctx, frame),
+                                   nt_errstr(status));
+                       goto fail;
+               }
+
+               status = cli_rpc_pipe_open_noauth_transport(
+                       cli, transport, &ndr_table_netlogon, &rpccli);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DBG_DEBUG("cli_rpc_pipe_open_noauth_transport "
+                                 "failed: %s\n", nt_errstr(status));
+                       goto fail;
+               }
+               goto done;
+       }
+
+       status = cli_rpc_pipe_open_bind_schannel(
+               cli, &ndr_table_netlogon, transport, creds_ctx, &rpccli);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_DEBUG("cli_rpc_pipe_open_bind_schannel "
+                         "failed: %s\n", nt_errstr(status));
+               goto fail;
+       }
+
+       status = netlogon_creds_cli_check(creds_ctx, rpccli->binding_handle,
+                                         NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_WARNING("netlogon_creds_cli_check failed: %s\n",
+                           nt_errstr(status));
+               goto fail;
+       }
+
+done:
+       *_rpccli = rpccli;
+       status = NT_STATUS_OK;
+fail:
+       ZERO_STRUCT(found_session_key);
+       TALLOC_FREE(lck);
+       TALLOC_FREE(frame);
+       return status;
+}
+
 /* 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,
-                                  uint16_t _ignored_validation_level,
-                                  int logon_type)
+NTSTATUS rpccli_netlogon_password_logon(
+       struct netlogon_creds_cli_context *creds_ctx,
+       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;
-       uint8_t authoritative = 0;
-       uint32_t flags = 0;
-       fstring clnt_name_slash;
+       char *workstation_slash = NULL;
 
-       logon = talloc_zero(mem_ctx, union netr_LogonLevel);
-       if (!logon) {
+       logon = talloc_zero(frame, union netr_LogonLevel);
+       if (logon == NULL) {
+               TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (workstation) {
-               fstr_sprintf( clnt_name_slash, "\\\\%s", workstation );
-       } else {
-               fstr_sprintf( clnt_name_slash, "\\\\%s", lp_netbios_name() );
+       if (workstation == NULL) {
+               workstation = lp_netbios_name();
+       }
+
+       workstation_slash = talloc_asprintf(frame, "\\\\%s", workstation);
+       if (workstation_slash == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
        }
 
        /* Initialise input parameters */
@@ -270,8 +496,9 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
                struct samr_Password lmpassword;
                struct samr_Password ntpassword;
 
-               password_info = talloc_zero(mem_ctx, struct netr_PasswordInfo);
-               if (!password_info) {
+               password_info = talloc_zero(frame, struct netr_PasswordInfo);
+               if (password_info == NULL) {
+                       TALLOC_FREE(frame);
                        return NT_STATUS_NO_MEMORY;
                }
 
@@ -282,7 +509,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
                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;
+               password_info->identity_info.workstation.string         = workstation_slash;
 
                password_info->lmpassword = lmpassword;
                password_info->ntpassword = ntpassword;
@@ -293,7 +520,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
        }
        case NetlogonNetworkInformation: {
                struct netr_NetworkInfo *network_info;
-               uint8 chal[8];
+               uint8_t chal[8];
                unsigned char local_lm_response[24];
                unsigned char local_nt_response[24];
                struct netr_ChallengeResponse lm;
@@ -302,8 +529,9 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
                ZERO_STRUCT(lm);
                ZERO_STRUCT(nt);
 
-               network_info = talloc_zero(mem_ctx, struct netr_NetworkInfo);
-               if (!network_info) {
+               network_info = talloc_zero(frame, struct netr_NetworkInfo);
+               if (network_info == NULL) {
+                       TALLOC_FREE(frame);
                        return NT_STATUS_NO_MEMORY;
                }
 
@@ -323,7 +551,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
                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;
+               network_info->identity_info.workstation.string          = workstation_slash;
 
                memcpy(network_info->challenge, chal, 8);
                network_info->nt = nt;
@@ -336,68 +564,32 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
        default:
                DEBUG(0, ("switch value %d not supported\n",
                        logon_type));
+               TALLOC_FREE(frame);
                return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       status = netlogon_creds_cli_LogonSamLogon(cli->netlogon_creds,
-                                                 cli->binding_handle,
+       status = netlogon_creds_cli_LogonSamLogon(creds_ctx,
+                                                 binding_handle,
                                                  logon_type,
                                                  logon,
-                                                 mem_ctx,
+                                                 frame,
                                                  &validation_level,
                                                  &validation,
-                                                 &authoritative,
-                                                 &flags);
+                                                 authoritative,
+                                                 flags);
        if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
                return status;
        }
 
-       return NT_STATUS_OK;
-}
-
-static NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
-                                       uint16_t validation_level,
-                                       union netr_Validation *validation,
-                                       struct netr_SamInfo3 **info3_p)
-{
-       struct netr_SamInfo3 *info3;
-       NTSTATUS status;
-
-       if (validation == NULL) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       switch (validation_level) {
-       case 3:
-               if (validation->sam3 == NULL) {
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
-
-               info3 = talloc_move(mem_ctx, &validation->sam3);
-               break;
-       case 6:
-               if (validation->sam6 == NULL) {
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
-
-               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;
-               }
-
-               info3->sidcount = validation->sam6->sidcount;
-               info3->sids = talloc_move(info3, &validation->sam6->sids);
-               break;
-       default:
-               return NT_STATUS_BAD_VALIDATION_CLASS;
+       status = map_validation_to_info3(mem_ctx,
+                                        validation_level, validation,
+                                        info3);
+       TALLOC_FREE(frame);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       *info3_p = info3;
 
        return NT_STATUS_OK;
 }
@@ -408,18 +600,21 @@ static NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
  * @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],
-                                          uint16_t _ignored_validation_level,
-                                          DATA_BLOB lm_response,
-                                          DATA_BLOB nt_response,
-                                          struct netr_SamInfo3 **info3)
+
+NTSTATUS rpccli_netlogon_network_logon(
+       struct netlogon_creds_cli_context *creds_ctx,
+       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)
 {
        NTSTATUS status;
        const char *workstation_name_slash;
@@ -427,8 +622,6 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
        struct netr_NetworkInfo *network_info;
        uint16_t validation_level = 0;
        union netr_Validation *validation = NULL;
-       uint8_t authoritative = 0;
-       uint32_t flags = 0;
        struct netr_ChallengeResponse lm;
        struct netr_ChallengeResponse nt;
 
@@ -480,15 +673,15 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 
        /* Marshall data and send request */
 
-       status = netlogon_creds_cli_LogonSamLogon(cli->netlogon_creds,
-                                                 cli->binding_handle,
+       status = netlogon_creds_cli_LogonSamLogon(creds_ctx,
+                                                 binding_handle,
                                                  NetlogonNetworkInformation,
                                                  logon,
                                                  mem_ctx,
                                                  &validation_level,
                                                  &validation,
-                                                 &authoritative,
-                                                 &flags);
+                                                 authoritative,
+                                                 flags);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -502,81 +695,3 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 
        return NT_STATUS_OK;
 }
-
-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],
-                                             uint16_t validation_level,
-                                             DATA_BLOB lm_response,
-                                             DATA_BLOB nt_response,
-                                             struct netr_SamInfo3 **info3)
-{
-       return rpccli_netlogon_sam_network_logon(cli,
-                                                mem_ctx,
-                                                logon_parameters,
-                                                server,
-                                                username,
-                                                domain,
-                                                workstation,
-                                                chal,
-                                                validation_level,
-                                                lm_response,
-                                                nt_response,
-                                                info3);
-}
-
-/*********************************************************
- Change the domain password on the PDC.
-
- Just changes the password betwen the two values specified.
-
- Caller must have the cli connected to the netlogon pipe
- already.
-**********************************************************/
-
-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)
-{
-       NTSTATUS result;
-
-       if (cli->netlogon_creds == NULL) {
-               uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS |
-                                       NETLOGON_NEG_SUPPORTS_AES;
-               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;
-               }
-       }
-
-       result = netlogon_creds_cli_ServerPasswordSet(cli->netlogon_creds,
-                                                     cli->binding_handle,
-                                                     new_trust_pwd_cleartext,
-                                                     NULL); /* new_version */
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(0,("netlogon_creds_cli_ServerPasswordSet failed: %s\n",
-                       nt_errstr(result)));
-               return result;
-       }
-
-       return NT_STATUS_OK;
-}
-