Revert "TODO netlogon_creds_cli_auth* cli_credentials"

This reverts commit 8aeec7ea8f22b4ddd8853c4f543af14145fcd9ef.

diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c
index 74a8366f383d32dcbdb37fd5d0fe81a365cd5175..72f33bd601432fb11bc63d098a1d16215d3b60b9 100644 (file)
--- a/libcli/auth/netlogon_creds_cli.c
+++ b/libcli/auth/netlogon_creds_cli.c
@@ -37,10 +37,7 @@
 #include "source3/include/messages.h"
 #include "source3/include/g_lock.h"
 #include "libds/common/roles.h"
-<<<<<<< HEAD
 #include "lib/crypto/crypto.h"
-=======
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
 #include "auth/credentials/credentials.h"
 
 struct netlogon_creds_cli_locked_state;
@@ -1073,16 +1070,10 @@ struct netlogon_creds_cli_auth_state {
        struct tevent_context *ev;
        struct netlogon_creds_cli_context *context;
        struct dcerpc_binding_handle *binding_handle;
-<<<<<<< HEAD
        uint8_t num_nt_hashes;
        uint8_t idx_nt_hashes;
        const struct samr_Password * const *nt_hashes;
        const struct samr_Password *used_nt_hash;
-=======
-       struct cli_credentials *cli_creds;
-       struct samr_Password *nt_hash;
-       struct samr_Password used_nt_hash;
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
        char *srv_name_slash;
        uint32_t current_flags;
        struct netr_Credential client_challenge;
@@ -1094,10 +1085,6 @@ struct netlogon_creds_cli_auth_state {
        bool try_auth3;
        bool try_auth2;
        bool require_auth2;
-<<<<<<< HEAD
-=======
-       struct netlogon_creds_cli_locked_state *locked_state;
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
 };
 
 static void netlogon_creds_cli_auth_challenge_start(struct tevent_req *req);
@@ -1106,19 +1093,12 @@ struct tevent_req *netlogon_creds_cli_auth_send(TALLOC_CTX *mem_ctx,
                                struct tevent_context *ev,
                                struct netlogon_creds_cli_context *context,
                                struct dcerpc_binding_handle *b,
-<<<<<<< HEAD
                                uint8_t num_nt_hashes,
                                const struct samr_Password * const *nt_hashes)
-=======
-                               struct cli_credentials *cli_creds)
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
 {
        struct tevent_req *req;
        struct netlogon_creds_cli_auth_state *state;
        NTSTATUS status;
-       const char *client_account;
-       const char *client_domain;
-       enum netr_SchannelType client_channel_type;
 
        req = tevent_req_create(mem_ctx, &state,
                                struct netlogon_creds_cli_auth_state);
@@ -1129,19 +1109,12 @@ struct tevent_req *netlogon_creds_cli_auth_send(TALLOC_CTX *mem_ctx,
        state->ev = ev;
        state->context = context;
        state->binding_handle = b;
-<<<<<<< HEAD
        if (num_nt_hashes < 1) {
                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
                return tevent_req_post(req, ev);
        }
        if (num_nt_hashes > 4) {
                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-=======
-       state->cli_creds = cli_creds;
-
-       if (context->db.locked_state != NULL) {
-               tevent_req_nterror(req, NT_STATUS_LOCK_NOT_GRANTED);
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
                return tevent_req_post(req, ev);
        }
 
@@ -1154,41 +1127,6 @@ struct tevent_req *netlogon_creds_cli_auth_send(TALLOC_CTX *mem_ctx,
                return tevent_req_post(req, ev);
        }
 
-       client_channel_type = cli_credentials_get_secure_channel_type(cli_creds);
-
-       client_account = cli_credentials_get_username(cli_creds);
-       if (client_account == NULL) {
-               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-               return tevent_req_post(req, ev);
-       }
-
-       client_domain = cli_credentials_get_domain(cli_creds);
-       if (client_domain == NULL) {
-               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-               return tevent_req_post(req, ev);
-       }
-
-       if (strcasecmp_m(context->client.account, client_account) != 0) {
-               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-               return tevent_req_post(req, ev);
-       }
-
-       if (strcasecmp_m(context->server.netbios_domain, client_domain) != 0) {
-               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-               return tevent_req_post(req, ev);
-       }
-
-       if (context->client.type != client_channel_type) {
-               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-               return tevent_req_post(req, ev);
-       }
-
-       state->nt_hash = cli_credentials_get_nt_hash(state->cli_creds, state);
-       if (state->nt_hash == NULL) {
-               tevent_req_nterror(req, NT_STATUS_CANT_ACCESS_DOMAIN_INFO);
-               return tevent_req_post(req, ev);
-       }
-
        state->srv_name_slash = talloc_asprintf(state, "\\\\%s",
                                                context->server.computer);
        if (tevent_req_nomem(state->srv_name_slash, req)) {
@@ -1202,11 +1140,7 @@ struct tevent_req *netlogon_creds_cli_auth_send(TALLOC_CTX *mem_ctx,
                state->require_auth2 = true;
        }
 
-<<<<<<< HEAD
        state->used_nt_hash = state->nt_hashes[state->idx_nt_hashes];
-=======
-       state->used_nt_hash = *state->nt_hash;
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
        state->current_flags = context->client.proposed_flags;
 
        status = dbwrap_purge(state->context->db.ctx,
@@ -1414,8 +1348,6 @@ static void netlogon_creds_cli_auth_srvauth_done(struct tevent_req *subreq)
        }
 
        if (NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED)) {
-               bool retry;
-               int cmp;
 
                tmp_flags = state->context->client.proposed_flags;
                if ((state->current_flags == tmp_flags) &&
@@ -1429,17 +1361,10 @@ static void netlogon_creds_cli_auth_srvauth_done(struct tevent_req *subreq)
                        return;
                }
 
-<<<<<<< HEAD
                state->idx_nt_hashes += 1;
                if (state->idx_nt_hashes >= state->num_nt_hashes) {
-=======
-               TALLOC_FREE(state->nt_hash);
-
-               retry = cli_credentials_wrong_password(state->cli_creds);
-               if (!retry) {
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
                        /*
-                        * we're not allowed to retry, giving up...
+                        * we already retried, giving up...
                         */
                        tevent_req_nterror(req, result);
                        return;
@@ -1448,29 +1373,7 @@ static void netlogon_creds_cli_auth_srvauth_done(struct tevent_req *subreq)
                /*
                 * lets retry with the old nt hash.
                 */
-<<<<<<< HEAD
                state->used_nt_hash = state->nt_hashes[state->idx_nt_hashes];
-=======
-               state->nt_hash = cli_credentials_get_nt_hash(state->cli_creds,
-                                                            state);
-               if (state->nt_hash == NULL) {
-                       tevent_req_nterror(req, NT_STATUS_CANT_ACCESS_DOMAIN_INFO);
-                       return;
-               }
-
-               cmp = memcmp(state->used_nt_hash.hash,
-                            state->nt_hash->hash,
-                            sizeof(state->nt_hash->hash));
-               if (cmp == 0) {
-                       /*
-                        * we don't retry with the same nt_hash, giving up...
-                        */
-                       tevent_req_nterror(req, result);
-                       return;
-               }
-
-               state->used_nt_hash = *state->nt_hash;
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
                state->current_flags = state->context->client.proposed_flags;
                netlogon_creds_cli_auth_challenge_start(req);
                return;
@@ -1526,13 +1429,9 @@ NTSTATUS netlogon_creds_cli_auth_recv(struct tevent_req *req,
 
 NTSTATUS netlogon_creds_cli_auth(struct netlogon_creds_cli_context *context,
                                 struct dcerpc_binding_handle *b,
-<<<<<<< HEAD
                                 uint8_t num_nt_hashes,
                                 const struct samr_Password * const *nt_hashes,
                                 uint8_t *idx_nt_hashes)
-=======
-                                struct cli_credentials *cli_creds)
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
 {
        TALLOC_CTX *frame = talloc_stackframe();
        struct tevent_context *ev;
@@ -1545,12 +1444,8 @@ NTSTATUS netlogon_creds_cli_auth(struct netlogon_creds_cli_context *context,
        if (ev == NULL) {
                goto fail;
        }
-<<<<<<< HEAD
        req = netlogon_creds_cli_auth_send(frame, ev, context, b,
                                           num_nt_hashes, nt_hashes);
-=======
-       req = netlogon_creds_cli_auth_send(frame, ev, context, b, cli_creds);
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
        if (req == NULL) {
                goto fail;
        }

diff --git a/libcli/auth/netlogon_creds_cli.h b/libcli/auth/netlogon_creds_cli.h
index ad0066de0f3a0eee49d00d1ad9f457a989bebba6..56a2dd9bc77bf653dc5f7ff0eb97da210c39d8c6 100644 (file)
--- a/libcli/auth/netlogon_creds_cli.h
+++ b/libcli/auth/netlogon_creds_cli.h
@@ -30,7 +30,6 @@ struct cli_credentials;
 struct messaging_context;
 struct dcerpc_binding_handle;
 struct db_context;
-struct cli_credentials;
 
 NTSTATUS netlogon_creds_cli_set_global_db(struct db_context **db);
 NTSTATUS netlogon_creds_cli_open_global_db(struct loadparm_context *lp_ctx);
@@ -103,7 +102,6 @@ struct tevent_req *netlogon_creds_cli_auth_send(TALLOC_CTX *mem_ctx,
                                struct tevent_context *ev,
                                struct netlogon_creds_cli_context *context,
                                struct dcerpc_binding_handle *b,
-<<<<<<< HEAD
                                uint8_t num_nt_hashes,
                                const struct samr_Password * const *nt_hashes);
 NTSTATUS netlogon_creds_cli_auth_recv(struct tevent_req *req,
@@ -113,13 +111,6 @@ NTSTATUS netlogon_creds_cli_auth(struct netlogon_creds_cli_context *context,
                                 uint8_t num_nt_hashes,
                                 const struct samr_Password * const *nt_hashes,
                                 uint8_t *idx_nt_hashes);
-=======
-                               struct cli_credentials *cli_creds);
-NTSTATUS netlogon_creds_cli_auth_recv(struct tevent_req *req);
-NTSTATUS netlogon_creds_cli_auth(struct netlogon_creds_cli_context *context,
-                                struct dcerpc_binding_handle *b,
-                                struct cli_credentials *cli_creds);
->>>>>>> a7ff30b... TODO netlogon_creds_cli_auth* cli_credentials
 
 struct tevent_req *netlogon_creds_cli_check_send(TALLOC_CTX *mem_ctx,
                                struct tevent_context *ev,

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 354cf2ee50faea73de22add081dcf2a3a48c4c93..475b7d694068d15fd41c09f09e3e5c7f4a5ca9b5 100644 (file)
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -30,7 +30,7 @@ bld.SAMBA_SUBSYSTEM('COMMON_SCHANNEL',
 
 bld.SAMBA_SUBSYSTEM('NETLOGON_CREDS_CLI',
         source='netlogon_creds_cli.c',
-        deps='dbwrap util_tdb tevent-util samba-hostconfig samba-credentials RPC_NDR_NETLOGON NDR_NETLOGON'
+        deps='dbwrap util_tdb tevent-util samba-hostconfig RPC_NDR_NETLOGON NDR_NETLOGON'
         )
 
 bld.SAMBA_SUBSYSTEM('PAM_ERRORS',