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)

Conflicts:
	source3/auth/auth_generic.c
	source3/auth/proto.h
	source3/auth/user_krb5.c

diff --git a/source3/auth/proto.h b/source3/auth/proto.h
index c851722155bedb1d1d6c5ba6a825c7f7f8ddf1a2..0ab32a788bbc626497d65549825cb9ffc25188e0 100644 (file)
--- a/source3/auth/proto.h
+++ b/source3/auth/proto.h
@@ -305,7 +305,7 @@ NTSTATUS make_server_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,
                                struct auth_serversupplied_info **server_info);
 

diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c
index 1e5254e9af1588d4b2b112961442bf334e6f2cad..fde2f48cb2328f7e759b7da1cd2ec01b0a44e1ec 100644 (file)
--- a/source3/auth/user_krb5.c
+++ b/source3/auth/user_krb5.c
@@ -184,7 +184,7 @@ NTSTATUS make_server_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,
                                struct auth_serversupplied_info **server_info)
 {
@@ -198,14 +198,14 @@ NTSTATUS make_server_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)));
@@ -284,7 +284,7 @@ NTSTATUS make_server_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,
                                struct auth_serversupplied_info **server_info)
 {