Add a mem_ctx argument to make_server_info_guest()

(This used to be commit e4a9492967f3d2b64f27943f99414608e0c03d21)

diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index ffc8b9496202ff7499634391f5b047c7196d99b5..3741f29779b361ac9a666f4d535aa12516e537d8 100644 (file)
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -42,7 +42,7 @@ static NTSTATUS check_guest_security(const struct auth_context *auth_context,
 
        if (!(user_info->internal_username 
              && *user_info->internal_username)) {
-               nt_status = make_server_info_guest(server_info);
+               nt_status = make_server_info_guest(NULL, server_info);
        }
 
        return nt_status;

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 038636f8682d8e9c5b28304261ca286b18567a09..bb3dc78e8374b39b736a3d773ec58480aa3b479a 100644 (file)
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -1224,9 +1224,10 @@ bool init_guest_info(void)
        return NT_STATUS_IS_OK(make_new_server_info_guest(&guest_info));
 }
 
-NTSTATUS make_server_info_guest(auth_serversupplied_info **server_info)
+NTSTATUS make_server_info_guest(TALLOC_CTX *mem_ctx,
+                               auth_serversupplied_info **server_info)
 {
-       *server_info = copy_serverinfo(NULL, guest_info);
+       *server_info = copy_serverinfo(mem_ctx, guest_info);
        return (*server_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
 }
 
@@ -1477,7 +1478,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
        if (!NT_STATUS_IS_OK(nt_status)) {
                TALLOC_FREE( sam_account );
                if ( lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID ) {
-                       make_server_info_guest(server_info); 
+                       make_server_info_guest(NULL, server_info);
                        return NT_STATUS_OK;
                }
                return nt_status;
@@ -1729,7 +1730,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
        if (!NT_STATUS_IS_OK(nt_status)) {
                TALLOC_FREE( result );
                if ( lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID ) {
-                       make_server_info_guest(server_info);
+                       make_server_info_guest(NULL, server_info);
                        return NT_STATUS_OK;
                }
                return nt_status;

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 9076949a8138319bb1044754552e19b7bce1fa2f..0f0a0d5f3177bf7496beba94b09cd475d032e1c7 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -45,7 +45,7 @@ static NTSTATUS do_map_to_guest(NTSTATUS status,
                    (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_PASSWORD)) {
                        DEBUG(3,("No such user %s [%s] - using guest account\n",
                                 user, domain));
-                       status = make_server_info_guest(server_info);
+                       status = make_server_info_guest(NULL, server_info);
                }
        }
 
@@ -53,7 +53,7 @@ static NTSTATUS do_map_to_guest(NTSTATUS status,
                if (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_PASSWORD) {
                        DEBUG(3,("Registered username %s for guest access\n",
                                user));
-                       status = make_server_info_guest(server_info);
+                       status = make_server_info_guest(NULL, server_info);
                }
        }
 
@@ -488,7 +488,7 @@ static void reply_spnego_kerberos(struct smb_request *req,
        reload_services(True);
 
        if ( map_domainuser_to_guest ) {
-               make_server_info_guest(&server_info);
+               make_server_info_guest(NULL, &server_info);
        } else if (logon_info) {
                /* pass the unmapped username here since map_username()
                   will be called again from inside make_server_info_info3() */