ctdb-scripts: Do not de-duplicate the interfaces list
[samba.git] / source3 / rpc_client / cli_netlogon.c
index 6caffd74a679abafee545a4a830bc7a40a750d78..762802d327806acade61559c8b4ace4a2cdc88de 100644 (file)
 */
 
 #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/auth/libcli_auth.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)
+#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/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"
+#include "lib/crypto/gnutls_helpers.h"
+
+
+NTSTATUS rpccli_pre_open_netlogon_creds(void)
 {
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       struct netr_Credential clnt_chal_send;
-       struct netr_Credential srv_chal_recv;
-       struct samr_Password password;
-       bool retried = false;
-       fstring mach_acct;
-
-       if (!ndr_syntax_id_equal(&cli->abstract_syntax,
-                                &ndr_table_netlogon.syntax_id)) {
-               return NT_STATUS_INVALID_PARAMETER;
+       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;
        }
 
-       TALLOC_FREE(cli->dc);
+       frame = talloc_stackframe();
 
-       /* Store the machine account password we're going to use. */
-       memcpy(password.hash, machine_pwd, 16);
+       lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers());
+       if (lp_ctx == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       fstr_sprintf( mach_acct, "%s$", machine_account);
+       fname = lpcfg_private_db_path(frame, lp_ctx, "netlogon_creds_cli");
+       if (fname == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
 
- again:
-       /* Create the client challenge. */
-       generate_random_buffer(clnt_chal_send.data, 8);
+       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;
+       }
 
-       /* Get the server challenge. */
-       result = rpccli_netr_ServerReqChallenge(cli, talloc_tos(),
-                                               cli->srv_name_slash,
-                                               clnt_name,
-                                               &clnt_chal_send,
-                                               &srv_chal_recv);
-       if (!NT_STATUS_IS_OK(result)) {
-               return result;
+       status = netlogon_creds_cli_set_global_db(lp_ctx, &global_db);
+       TALLOC_FREE(frame);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       /* Calculate the session key and client credentials */
-       
-       cli->dc = netlogon_creds_client_init(cli,
-                                   mach_acct,
-                                   clnt_name,
-                                   &clnt_chal_send,
-                                   &srv_chal_recv,
-                                   &password,
-                                   &clnt_chal_send,
-                                   *neg_flags_inout);
+       already_open = true;
+       return NT_STATUS_OK;
+}
 
-       if (!cli->dc) {
+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);
                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;
+       }
 
-       /*
-        * Send client auth-2 challenge and receive server repy.
-        */
+       return NT_STATUS_OK;
+}
+
+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);
+}
 
-       result = rpccli_netr_ServerAuthenticate2(cli, 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_inout);
+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;
+       const char *remote_name = NULL;
+       const struct sockaddr_storage *remote_sockaddr = NULL;
+
+       status = netlogon_creds_cli_get(creds_ctx, frame, &creds);
+       if (NT_STATUS_IS_OK(status)) {
+               const char *action = "using";
+
+               if (force_reauth) {
+                       action = "overwrite";
+               }
+
+               if (cli != NULL) {
+                       remote_name = smbXcli_conn_remote_name(cli->conn);
+               } else {
+                       remote_name = "<UNKNOWN>";
+               }
+
+               DEBUG(5,("%s: %s cached netlogon_creds cli[%s/%s] to %s\n",
+                        __FUNCTION__, action,
+                        creds->account_name, creds->computer_name,
+                        remote_name));
+               if (!force_reauth) {
+                       goto done;
+               }
+               TALLOC_FREE(creds);
+       }
+
+       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;
+       }
+
+       remote_name = smbXcli_conn_remote_name(cli->conn);
+       remote_sockaddr = smbXcli_conn_remote_sockaddr(cli->conn);
+
+       status = cli_rpc_pipe_open_noauth_transport(cli,
+                                                   transport,
+                                                   &ndr_table_netlogon,
+                                                   remote_name,
+                                                   remote_sockaddr,
+                                                   &netlogon_pipe);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5,("%s: failed to open noauth netlogon connection to %s - %s\n",
+                        __FUNCTION__,
+                        remote_name,
+                        nt_errstr(status)));
+               TALLOC_FREE(frame);
+               return status;
+       }
+       talloc_steal(frame, netlogon_pipe);
+
+       status = netlogon_creds_cli_auth(creds_ctx,
+                                        netlogon_pipe->binding_handle,
+                                        num_nt_hashes,
+                                        nt_hashes,
+                                        &idx_nt_hashes);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return status;
+       }
+
+       status = netlogon_creds_cli_get(creds_ctx, frame, &creds);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       DEBUG(5,("%s: using new netlogon_creds cli[%s/%s] to %s\n",
+                __FUNCTION__,
+                creds->account_name, creds->computer_name,
+                remote_name));
+
+done:
+       if (negotiate_flags != NULL) {
+               *negotiate_flags = creds->negotiate_flags;
+       }
 
-       /* we might be talking to NT4, so let's downgrade in that case and retry
-        * with the returned neg_flags - gd */
+       TALLOC_FREE(frame);
+       return NT_STATUS_OK;
+}
 
-       if (NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) && !retried) {
-               retried = true;
-               TALLOC_FREE(cli->dc);
-               goto again;
+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;
        }
 
-       if (!NT_STATUS_IS_OK(result)) {
-               return result;
+       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;
+       const char *remote_name = NULL;
+       const struct sockaddr_storage *remote_sockaddr = NULL;
+
+       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:
+
        /*
-        * Check the returned value using the initial
-        * server received challenge.
+        * 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)) {
+               bool cmp = mem_equal_const_time(found_session_key,
+                                               creds->session_key,
+                                               sizeof(found_session_key));
+               found_existing_creds = !cmp;
+
+               memcpy(found_session_key,
+                      creds->session_key,
+                      sizeof(found_session_key));
 
-       if (!netlogon_creds_client_check(cli->dc, &srv_chal_recv)) {
+               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) {
                /*
-                * Server replied with bad credential. Fail.
+                * Try to find creds under the lock again. Someone
+                * else might have done it for us.
                 */
-               DEBUG(0,("rpccli_netlogon_setup_creds: server %s "
-                       "replied with bad credential\n",
-                       cli->desthost ));
-               return NT_STATUS_ACCESS_DENIED;
+               status = netlogon_creds_cli_get(creds_ctx, frame, &creds);
+
+               if (NT_STATUS_IS_OK(status)) {
+                       bool cmp = mem_equal_const_time(found_session_key,
+                                                       creds->session_key,
+                                                       sizeof(found_session_key));
+                       found_existing_creds = !cmp;
+
+                       memcpy(found_session_key, creds->session_key,
+                              sizeof(found_session_key));
+
+                       TALLOC_FREE(creds);
+               }
        }
 
-       DEBUG(5,("rpccli_netlogon_setup_creds: server %s credential "
-               "chain established.\n",
-               cli->desthost ));
+       remote_name = smbXcli_conn_remote_name(cli->conn);
+       remote_sockaddr = smbXcli_conn_remote_sockaddr(cli->conn);
 
-       return NT_STATUS_OK;
+       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,
+                                                        remote_name,
+                                                        remote_sockaddr,
+                                                        &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,
+                                                           remote_name,
+                                                           remote_sockaddr,
+                                                           &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,
+                                                remote_name,
+                                                remote_sockaddr,
+                                                &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,
-                                  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,
+       const uint64_t logon_id,
+       enum netr_LogonInfoClass logon_type,
+       uint8_t *authoritative,
+       uint32_t *flags,
+       uint16_t *_validation_level,
+       union netr_Validation **_validation)
 {
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       struct netr_Authenticator clnt_creds;
-       struct netr_Authenticator ret_creds;
+       TALLOC_CTX *frame = talloc_stackframe();
+       NTSTATUS status;
        union netr_LogonLevel *logon;
-       union netr_Validation validation;
-       uint8_t authoritative;
-       int validation_level = 3;
-       fstring clnt_name_slash;
-       uint8 zeros[16];
-
-       ZERO_STRUCT(ret_creds);
-       ZERO_STRUCT(zeros);
-
-       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
-       if (!logon) {
+       uint16_t validation_level = 0;
+       union netr_Validation *validation = NULL;
+       char *workstation_slash = NULL;
+
+       unsigned char local_nt_response[24];
+       unsigned char local_lm_response[24];
+       struct samr_Password lmpassword = {.hash = {0}};
+       struct samr_Password ntpassword = {.hash = {0}};
+       struct netr_ChallengeResponse lm = {0};
+       struct netr_ChallengeResponse nt = {0};
+
+       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", global_myname() );
+       if (workstation == NULL) {
+               workstation = lp_netbios_name();
        }
 
-       /* Initialise input parameters */
+       workstation_slash = talloc_asprintf(frame, "\\\\%s", workstation);
+       if (workstation_slash == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       netlogon_creds_client_authenticator(cli->dc, &clnt_creds);
+       /* Initialise input parameters */
 
        switch (logon_type) {
-       case NetlogonInteractiveInformation: {
+       case NetlogonInteractiveInformation:
+       case NetlogonInteractiveTransitiveInformation: {
 
                struct netr_PasswordInfo *password_info;
 
-               struct samr_Password lmpassword;
-               struct samr_Password ntpassword;
 
-               password_info = TALLOC_ZERO_P(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;
                }
 
                nt_lm_owf_gen(password, ntpassword.hash, lmpassword.hash);
 
-               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);
-               }
-
                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.logon_id                   = logon_id;
                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;
@@ -210,26 +556,29 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 
                break;
        }
-       case NetlogonNetworkInformation: {
+       case NetlogonNetworkInformation:
+       case NetlogonNetworkTransitiveInformation: {
                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;
+               uint8_t chal[8];
+               int rc;
 
                ZERO_STRUCT(lm);
                ZERO_STRUCT(nt);
 
-               network_info = TALLOC_ZERO_P(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;
                }
 
                generate_random_buffer(chal, 8);
 
                SMBencrypt(password, chal, local_lm_response);
-               SMBNTencrypt(password, chal, local_nt_response);
+               rc = SMBNTencrypt(password, chal, local_nt_response);
+               if (rc != 0) {
+                       TALLOC_FREE(frame);
+                       return gnutls_error_to_ntstatus(rc, NT_STATUS_ACCESS_DISABLED_BY_POLICY_OTHER);
+               }
 
                lm.length = 24;
                lm.data = local_lm_response;
@@ -239,10 +588,9 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 
                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.logon_id                    = logon_id;
                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;
@@ -255,29 +603,30 @@ 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;
        }
 
-       result = rpccli_netr_LogonSamLogon(cli, mem_ctx,
-                                          cli->srv_name_slash,
-                                          global_myname(),
-                                          &clnt_creds,
-                                          &ret_creds,
-                                          logon_type,
-                                          logon,
-                                          validation_level,
-                                          &validation,
-                                          &authoritative);
-
-       /* 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;
+       status = netlogon_creds_cli_LogonSamLogon(creds_ctx,
+                                                 binding_handle,
+                                                 logon_type,
+                                                 logon,
+                                                 mem_ctx,
+                                                 &validation_level,
+                                                 &validation,
+                                                 authoritative,
+                                                 flags);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return status;
        }
 
-       return result;
-}
+       TALLOC_FREE(frame);
+       *_validation_level = validation_level;
+       *_validation = validation;
 
+       return NT_STATUS_OK;
+}
 
 /**
  * Logon domain user with an 'network' SAM logon
@@ -285,56 +634,61 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
  * @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,
-                                          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 uint64_t logon_id,
+       DATA_BLOB chal,
+       DATA_BLOB lm_response,
+       DATA_BLOB nt_response,
+       enum netr_LogonInfoClass logon_type,
+       uint8_t *authoritative,
+       uint32_t *flags,
+       uint16_t *_validation_level,
+       union netr_Validation **_validation)
 {
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       int validation_level = 3;
+       NTSTATUS status;
        const char *workstation_name_slash;
-       const char *server_name_slash;
-       uint8 zeros[16];
-       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;
+       uint16_t validation_level = 0;
+       union netr_Validation *validation = NULL;
        struct netr_ChallengeResponse lm;
        struct netr_ChallengeResponse nt;
 
-       *info3 = NULL;
-
-       ZERO_STRUCT(zeros);
-       ZERO_STRUCT(ret_creds);
+       *_validation = NULL;
 
        ZERO_STRUCT(lm);
        ZERO_STRUCT(nt);
 
-       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+       switch (logon_type) {
+       case NetlogonNetworkInformation:
+       case NetlogonNetworkTransitiveInformation:
+               break;
+       default:
+               DEBUG(0, ("switch value %d not supported\n",
+                       logon_type));
+               return NT_STATUS_INVALID_INFO_CLASS;
+       }
+
+       logon = talloc_zero(mem_ctx, union netr_LogonLevel);
        if (!logon) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       network_info = TALLOC_ZERO_P(mem_ctx, struct netr_NetworkInfo);
+       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);
-       } else {
-               server_name_slash = server;
+       if (workstation == NULL) {
+               workstation = lp_netbios_name();
        }
 
        if (workstation[0] != '\\' && workstation[1] != '\\') {
@@ -343,7 +697,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon(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;
        }
@@ -357,12 +711,16 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 
        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.logon_id                    = logon_id;
        network_info->identity_info.account_name.string         = username;
        network_info->identity_info.workstation.string          = workstation_name_slash;
 
-       memcpy(network_info->challenge, chal, 8);
+       if (chal.length != 8) {
+               DBG_WARNING("Invalid challenge length %zd\n", chal.length);
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       memcpy(network_info->challenge, chal.data, chal.length);
        network_info->nt = nt;
        network_info->lm = lm;
 
@@ -370,220 +728,133 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 
        /* Marshall data and send request */
 
-       result = rpccli_netr_LogonSamLogon(cli, mem_ctx,
-                                          server_name_slash,
-                                          global_myname(),
-                                          &clnt_creds,
-                                          &ret_creds,
-                                          NetlogonNetworkInformation,
-                                          logon,
-                                          validation_level,
-                                          &validation,
-                                          &authoritative);
-       if (!NT_STATUS_IS_OK(result)) {
-               return result;
-       }
-
-       /* 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;
+       status = netlogon_creds_cli_LogonSamLogon(creds_ctx,
+                                                 binding_handle,
+                                                 logon_type,
+                                                 logon,
+                                                 mem_ctx,
+                                                 &validation_level,
+                                                 &validation,
+                                                 authoritative,
+                                                 flags);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       netlogon_creds_decrypt_samlogon(cli->dc, validation_level, &validation);
+       *_validation_level = validation_level;
+       *_validation = validation;
 
-       *info3 = validation.sam3;
-
-       return result;
+       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],
-                                             DATA_BLOB lm_response,
-                                             DATA_BLOB nt_response,
-                                             struct netr_SamInfo3 **info3)
+NTSTATUS rpccli_netlogon_interactive_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 uint64_t logon_id,
+       DATA_BLOB lm_hash,
+       DATA_BLOB nt_hash,
+       enum netr_LogonInfoClass logon_type,
+       uint8_t *authoritative,
+       uint32_t *flags,
+       uint16_t *_validation_level,
+       union netr_Validation **_validation)
 {
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       int validation_level = 3;
+       TALLOC_CTX *frame = talloc_stackframe();
+       NTSTATUS status;
        const char *workstation_name_slash;
-       const char *server_name_slash;
-       uint8 zeros[16];
        union netr_LogonLevel *logon = NULL;
-       struct netr_NetworkInfo *network_info;
-       uint8_t authoritative;
-       union netr_Validation validation;
+       struct netr_PasswordInfo *password_info = NULL;
+       uint16_t validation_level = 0;
+       union netr_Validation *validation = NULL;
        struct netr_ChallengeResponse lm;
        struct netr_ChallengeResponse nt;
-       uint32_t flags = 0;
 
-       *info3 = NULL;
-
-       ZERO_STRUCT(zeros);
+       *_validation = NULL;
 
        ZERO_STRUCT(lm);
        ZERO_STRUCT(nt);
 
-       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
-       if (!logon) {
-               return NT_STATUS_NO_MEMORY;
+       switch (logon_type) {
+       case NetlogonInteractiveInformation:
+       case NetlogonInteractiveTransitiveInformation:
+               break;
+       default:
+               DEBUG(0, ("switch value %d not supported\n",
+                       logon_type));
+               TALLOC_FREE(frame);
+               return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       network_info = TALLOC_ZERO_P(mem_ctx, struct netr_NetworkInfo);
-       if (!network_info) {
+       logon = talloc_zero(mem_ctx, union netr_LogonLevel);
+       if (logon == NULL) {
+               TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (server[0] != '\\' && server[1] != '\\') {
-               server_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", server);
-       } else {
-               server_name_slash = server;
+       password_info = talloc_zero(logon, struct netr_PasswordInfo);
+       if (password_info == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
        }
 
        if (workstation[0] != '\\' && workstation[1] != '\\') {
-               workstation_name_slash = talloc_asprintf(mem_ctx, "\\\\%s", workstation);
+               workstation_name_slash = talloc_asprintf(frame, "\\\\%s", workstation);
        } else {
                workstation_name_slash = workstation;
        }
 
-       if (!workstation_name_slash || !server_name_slash) {
-               DEBUG(0, ("talloc_asprintf failed!\n"));
+       if (workstation_name_slash == NULL) {
+               TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
 
        /* Initialise input parameters */
 
-       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 */
+       password_info->identity_info.domain_name.string         = domain;
+       password_info->identity_info.parameter_control          = logon_parameters;
+       password_info->identity_info.logon_id                   = logon_id;
+       password_info->identity_info.account_name.string        = username;
+       password_info->identity_info.workstation.string         = workstation_name_slash;
 
-       result = rpccli_netr_LogonSamLogonEx(cli, mem_ctx,
-                                            server_name_slash,
-                                            global_myname(),
-                                            NetlogonNetworkInformation,
-                                            logon,
-                                            validation_level,
-                                            &validation,
-                                            &authoritative,
-                                            &flags);
-       if (!NT_STATUS_IS_OK(result)) {
-               return result;
+       if (nt_hash.length != sizeof(password_info->ntpassword.hash)) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_INVALID_PARAMETER;
        }
-
-       netlogon_creds_decrypt_samlogon(cli->dc, validation_level, &validation);
-
-       *info3 = validation.sam3;
-
-       return result;
-}
-
-/*********************************************************
- 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 unsigned char orig_trust_passwd_hash[16],
-                                           const char *new_trust_pwd_cleartext,
-                                           const unsigned char new_trust_passwd_hash[16],
-                                           uint32_t sec_channel_type)
-{
-       NTSTATUS result;
-       uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
-       struct netr_Authenticator clnt_creds, srv_cred;
-
-       if (!cli->dc) {
-               result = rpccli_netlogon_setup_creds(cli,
-                                                    cli->desthost, /* server name */
-                                                    lp_workgroup(), /* domain */
-                                                    global_myname(), /* client name */
-                                                    global_myname(), /* 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;
+       memcpy(password_info->ntpassword.hash, nt_hash.data, nt_hash.length);
+       if (lm_hash.length != 0) {
+               if (lm_hash.length != sizeof(password_info->lmpassword.hash)) {
+                       TALLOC_FREE(frame);
+                       return NT_STATUS_INVALID_PARAMETER;
                }
+               memcpy(password_info->lmpassword.hash, lm_hash.data, lm_hash.length);
        }
 
-       netlogon_creds_client_authenticator(cli->dc, &clnt_creds);
+       logon->password = password_info;
 
-       if (neg_flags & NETLOGON_NEG_PASSWORD_SET2) {
-
-               struct netr_CryptPassword new_password;
-
-               init_netr_CryptPassword(new_trust_pwd_cleartext,
-                                       cli->dc->session_key,
-                                       &new_password);
-
-               result = rpccli_netr_ServerPasswordSet2(cli, mem_ctx,
-                                                       cli->srv_name_slash,
-                                                       cli->dc->account_name,
-                                                       sec_channel_type,
-                                                       cli->dc->computer_name,
-                                                       &clnt_creds,
-                                                       &srv_cred,
-                                                       &new_password);
-               if (!NT_STATUS_IS_OK(result)) {
-                       DEBUG(0,("rpccli_netr_ServerPasswordSet2 failed: %s\n",
-                               nt_errstr(result)));
-                       return result;
-               }
-       } else {
+       /* Marshall data and send request */
 
-               struct samr_Password new_password;
-               memcpy(new_password.hash, new_trust_passwd_hash, sizeof(new_password.hash));
-               netlogon_creds_des_encrypt(cli->dc, &new_password);
-
-               result = rpccli_netr_ServerPasswordSet(cli, mem_ctx,
-                                                      cli->srv_name_slash,
-                                                      cli->dc->account_name,
-                                                      sec_channel_type,
-                                                      cli->dc->computer_name,
-                                                      &clnt_creds,
-                                                      &srv_cred,
-                                                      &new_password);
-               if (!NT_STATUS_IS_OK(result)) {
-                       DEBUG(0,("rpccli_netr_ServerPasswordSet failed: %s\n",
-                               nt_errstr(result)));
-                       return result;
-               }
+       status = netlogon_creds_cli_LogonSamLogon(creds_ctx,
+                                                 binding_handle,
+                                                 logon_type,
+                                                 logon,
+                                                 mem_ctx,
+                                                 &validation_level,
+                                                 &validation,
+                                                 authoritative,
+                                                 flags);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return status;
        }
 
-       /* Always check returned credentials. */
-       if (!netlogon_creds_client_check(cli->dc, &srv_cred.cred)) {
-               DEBUG(0,("credentials chain check failed\n"));
-               return NT_STATUS_ACCESS_DENIED;
-       }
+       *_validation_level = validation_level;
+       *_validation = validation;
 
-       return result;
+       TALLOC_FREE(frame);
+       return NT_STATUS_OK;
 }
-