s3: auth: Change make_server_info_info3() to take a const struct netr_SamInfo3 pointe...

make_server_info_info3() only reads from the info3 pointer.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-by: Simo Sorce <idra@samba.org>

diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c
index 05c4ddcede46c5e3a7c59ac7731e53fe47a5401b..6b146a084bc5a2c00c4469af3e9d4ce63a88ff5c 100644 (file)
--- a/source3/auth/auth_generic.c
+++ b/source3/auth/auth_generic.c
@@ -113,7 +113,7 @@ static NTSTATUS auth3_generate_session_info_pac(struct auth4_context *auth_ctx,
 
        status = make_session_info_krb5(mem_ctx,
                                        ntuser, ntdomain, username, pw,
-                                       logon_info, is_guest, is_mapped, NULL /* No session key for now, caller will sort it out */,
+                                       &logon_info->info3, is_guest, is_mapped, NULL /* No session key for now, caller will sort it out */,
                                        session_info);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1, ("Failed to map kerberos pac to server info (%s)\n",

diff --git a/source3/auth/proto.h b/source3/auth/proto.h
index 686582a2acd48a4f0757cd4f89659074ca7d778c..ab8fb899c6b9f2bf4d021ec5a2d093138097a240 100644 (file)
--- a/source3/auth/proto.h
+++ b/source3/auth/proto.h
@@ -372,7 +372,7 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
                                char *ntdomain,
                                char *username,
                                struct passwd *pw,
-                               struct PAC_LOGON_INFO *logon_info,
+                               const struct netr_SamInfo3 *info3,
                                bool mapped_to_guest, bool username_was_mapped,
                                DATA_BLOB *session_key,
                                struct auth_session_info **session_info);

diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c
index 6b8fad2c0aef357247968046ebbf658a25848c37..7442ea424e0144cbf6b28e7fb8abdfeb1a7c744f 100644 (file)
--- a/source3/auth/user_krb5.c
+++ b/source3/auth/user_krb5.c
@@ -186,7 +186,7 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
                                char *ntdomain,
                                char *username,
                                struct passwd *pw,
-                               struct PAC_LOGON_INFO *logon_info,
+                               const struct netr_SamInfo3 *info3,
                                bool mapped_to_guest, bool username_was_mapped,
                                DATA_BLOB *session_key,
                                struct auth_session_info **session_info)
@@ -202,14 +202,14 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
                        return status;
                }
 
-       } else if (logon_info) {
+       } else if (info3) {
                /* pass the unmapped username here since map_username()
                   will be called again in make_server_info_info3() */
 
                status = make_server_info_info3(mem_ctx,
                                                ntuser, ntdomain,
                                                &server_info,
-                                               &logon_info->info3);
+                                               info3);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(1, ("make_server_info_info3 failed: %s!\n",
                                  nt_errstr(status)));
@@ -298,7 +298,7 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
                                char *ntdomain,
                                char *username,
                                struct passwd *pw,
-                               struct PAC_LOGON_INFO *logon_info,
+                               const struct netr_SamInfo3 *info3,
                                bool mapped_to_guest, bool username_was_mapped,
                                DATA_BLOB *session_key,
                                struct auth_session_info **session_info)