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>
(cherry picked from commit 527f7b54388713acaaf7b66c718cc0f7114fc368)

diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c
index a2ba4e32573d2a1aca2a2bb02b78b3c100aa4701..2880bc9e019060f74bad7e7b4bfa62f28998fc91 100644 (file)
--- a/source3/auth/auth_generic.c
+++ b/source3/auth/auth_generic.c
@@ -112,7 +112,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 6ec206ec81a98e98b7e908953e4097571dc0850f..75d1097353654f3c0b54031db361cc2357bb3c9e 100644 (file)
--- a/source3/auth/proto.h
+++ b/source3/auth/proto.h
@@ -357,7 +357,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 974a8aa2f815e3a5e26e0d59d88643266897babf..0a538b4a7ac87c2b8637b8041556aa33617564b3 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)));
@@ -299,7 +299,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)