s3-auth Use struct auth3_session_info outside the auth subsystem

[kai/samba-autobuild/.git] / source3 / smbd / service.c

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 5c410be02a68e47443d874298d8edac80bfff23f..c772b8a0699be209b8bc2017dc45731e313991e9 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -373,22 +373,22 @@ static NTSTATUS find_forced_group(bool force_user,
 }
 
 /****************************************************************************
-  Create an auth_serversupplied_info structure for a connection_struct
+  Create an auth3_session_info structure for a connection_struct
 ****************************************************************************/
 
 static NTSTATUS create_connection_session_info(struct smbd_server_connection *sconn,
                                              TALLOC_CTX *mem_ctx, int snum,
-                                              struct auth_serversupplied_info *vuid_serverinfo,
+                                              struct auth3_session_info *vuid_serverinfo,
                                              DATA_BLOB password,
-                                              struct auth_serversupplied_info **presult)
+                                              struct auth3_session_info **presult)
 {
         if (lp_guest_only(snum)) {
-                return make_server_info_guest(mem_ctx, presult);
+                return make_session_info_guest(mem_ctx, presult);
         }
 
         if (vuid_serverinfo != NULL) {
 
-               struct auth_serversupplied_info *result;
+               struct auth3_session_info *result;
 
                 /*
                  * This is the normal security != share case where we have a
@@ -414,7 +414,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc
                         }
                 }
 
-                result = copy_serverinfo(mem_ctx, vuid_serverinfo);
+                result = copy_session_info(mem_ctx, vuid_serverinfo);
                if (result == NULL) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -466,7 +466,7 @@ NTSTATUS set_conn_force_user_group(connection_struct *conn, int snum)
                 */
 
                char *fuser;
-               struct auth_serversupplied_info *forced_serverinfo;
+               struct auth3_session_info *forced_serverinfo;
 
                fuser = talloc_string_sub(conn, lp_force_user(snum), "%S",
                                          lp_const_servicename(snum));