libcli/auth: pass auth_{type,level} to netlogon_creds_server_step_check()

This will make it easier to implement netr_ServerAuthenticateKerberos() later...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15425

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
(cherry picked from commit 2956c7eb3c9fc2161fd2748e5aac1fc94478e8c7)

diff --git a/libcli/auth/credentials.c b/libcli/auth/credentials.c
index 4fcd1ff96c5b6fa85e97b453626a157aafd54488..2c46c5a582c0909ded04cb2b5dff06715928c12a 100644 (file)
--- a/libcli/auth/credentials.c
+++ b/libcli/auth/credentials.c
@@ -798,7 +798,9 @@ struct netlogon_creds_CredentialState *netlogon_creds_server_init(TALLOC_CTX *me
 
 NTSTATUS netlogon_creds_server_step_check(struct netlogon_creds_CredentialState *creds,
                                 const struct netr_Authenticator *received_authenticator,
-                                struct netr_Authenticator *return_authenticator)
+                                struct netr_Authenticator *return_authenticator,
+                                enum dcerpc_AuthType auth_type,
+                                enum dcerpc_AuthLevel auth_level)
 {
        NTSTATUS status;
 

diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
index 53a7d2062dbd4b9ae6f1c4540a9e9ecd14e66743..75eb41abed1f4355638c339808c9baa6dccc03cf 100644 (file)
--- a/libcli/auth/proto.h
+++ b/libcli/auth/proto.h
@@ -71,7 +71,9 @@ struct netlogon_creds_CredentialState *netlogon_creds_server_init(TALLOC_CTX *me
                                                                  uint32_t negotiate_flags);
 NTSTATUS netlogon_creds_server_step_check(struct netlogon_creds_CredentialState *creds,
                                 const struct netr_Authenticator *received_authenticator,
-                                struct netr_Authenticator *return_authenticator) ;
+                                struct netr_Authenticator *return_authenticator,
+                                enum dcerpc_AuthType auth_type,
+                                enum dcerpc_AuthLevel auth_level);
 NTSTATUS netlogon_creds_decrypt_samlogon_validation(struct netlogon_creds_CredentialState *creds,
                                                    uint16_t validation_level,
                                                    union netr_Validation *validation,

diff --git a/libcli/auth/schannel_state_tdb.c b/libcli/auth/schannel_state_tdb.c
index 717d41b05d7b42404f39f6093346a0d161596065..b823ab6471d767ca65ed02cf1196ef8d4b849121 100644 (file)
--- a/libcli/auth/schannel_state_tdb.c
+++ b/libcli/auth/schannel_state_tdb.c
@@ -630,7 +630,9 @@ NTSTATUS schannel_check_creds_state(TALLOC_CTX *mem_ctx,
 
        status = netlogon_creds_server_step_check(creds,
                                                  received_authenticator,
-                                                 return_authenticator);
+                                                 return_authenticator,
+                                                 auth_type,
+                                                 auth_level);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }