s3-auth Use struct auth3_session_info outside the auth subsystem

This seperation between the structure used inside the auth modules and
in the wider codebase allows for a gradual migration from struct
auth_serversupplied_info -> struct auth_session_info (from auth.idl)

The idea here is that we keep a clear seperation between the structure
before and after the local groups, local user lookup and the session
key modifications have been processed, as the lack of this seperation
has caused issues in the past.

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>

3 files changed, 69 insertions, 69 deletions

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 0bf678780b..6d62bcb526 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -554,7 +554,7 @@ static void prune_printername_cache(void)
 ****************************************************************************/
 
 static WERROR set_printer_hnd_name(TALLOC_CTX *mem_ctx,
-				   const struct auth_serversupplied_info *session_info,
+				   const struct auth3_session_info *session_info,
 				   struct messaging_context *msg_ctx,
 				   struct printer_handle *Printer,
 				   const char *handlename)
@@ -1536,7 +1536,7 @@ void do_drv_upgrade_printer(struct messaging_context *msg,
 			    DATA_BLOB *data)
 {
 	TALLOC_CTX *tmp_ctx;
-	struct auth_serversupplied_info *session_info = NULL;
+	struct auth3_session_info *session_info = NULL;
 	struct spoolss_PrinterInfo2 *pinfo2;
 	NTSTATUS status;
 	WERROR result;
@@ -3887,7 +3887,7 @@ static void compose_devicemode_devicename(struct spoolss_DeviceMode *dm,
  ********************************************************************/
 
 static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx,
-				      const struct auth_serversupplied_info *session_info,
+				      const struct auth3_session_info *session_info,
 				      struct messaging_context *msg_ctx,
 				      struct spoolss_PrinterInfo2 *info2,
 				      const char *servername,
@@ -4230,7 +4230,7 @@ static WERROR construct_printer_info7(TALLOC_CTX *mem_ctx,
 				      struct spoolss_PrinterInfo7 *r,
 				      int snum)
 {
-	struct auth_serversupplied_info *session_info;
+	struct auth3_session_info *session_info;
 	struct GUID guid;
 	NTSTATUS status;
 
@@ -4299,7 +4299,7 @@ static bool snum_is_shared_printer(int snum)
 ********************************************************************/
 
 static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *servername,
 					   uint32_t level,
@@ -4420,7 +4420,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx,
  ********************************************************************/
 
 static WERROR enumprinters_level0(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  uint32_t flags,
 				  const char *servername,
@@ -4438,7 +4438,7 @@ static WERROR enumprinters_level0(TALLOC_CTX *mem_ctx,
 ********************************************************************/
 
 static WERROR enum_all_printers_info_1(TALLOC_CTX *mem_ctx,
-				       const struct auth_serversupplied_info *session_info,
+				       const struct auth3_session_info *session_info,
 				       struct messaging_context *msg_ctx,
 				       const char *servername,
 				       uint32_t flags,
@@ -4456,7 +4456,7 @@ static WERROR enum_all_printers_info_1(TALLOC_CTX *mem_ctx,
 *********************************************************************/
 
 static WERROR enum_all_printers_info_1_local(TALLOC_CTX *mem_ctx,
-					     const struct auth_serversupplied_info *session_info,
+					     const struct auth3_session_info *session_info,
 					     struct messaging_context *msg_ctx,
 					     const char *servername,
 					     union spoolss_PrinterInfo **info,
@@ -4473,7 +4473,7 @@ static WERROR enum_all_printers_info_1_local(TALLOC_CTX *mem_ctx,
 *********************************************************************/
 
 static WERROR enum_all_printers_info_1_name(TALLOC_CTX *mem_ctx,
-					    const struct auth_serversupplied_info *session_info,
+					    const struct auth3_session_info *session_info,
 					    struct messaging_context *msg_ctx,
 					    const char *servername,
 					    union spoolss_PrinterInfo **info,
@@ -4500,7 +4500,7 @@ static WERROR enum_all_printers_info_1_name(TALLOC_CTX *mem_ctx,
 *********************************************************************/
 
 static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx,
-					       const struct auth_serversupplied_info *session_info,
+					       const struct auth3_session_info *session_info,
 					       struct messaging_context *msg_ctx,
 					       const char *servername,
 					       union spoolss_PrinterInfo **info,
@@ -4537,7 +4537,7 @@ static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx,
  ********************************************************************/
 
 static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx,
-				       const struct auth_serversupplied_info *session_info,
+				       const struct auth3_session_info *session_info,
 				       struct messaging_context *msg_ctx,
 				       const char *servername,
 				       union spoolss_PrinterInfo **info,
@@ -4554,7 +4554,7 @@ static WERROR enum_all_printers_info_2(TALLOC_CTX *mem_ctx,
  ********************************************************************/
 
 static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  uint32_t flags,
 				  const char *servername,
@@ -4588,7 +4588,7 @@ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx,
  ********************************************************************/
 
 static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  uint32_t flags,
 				  const char *servername,
@@ -4624,7 +4624,7 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx,
  ********************************************************************/
 
 static WERROR enumprinters_level4(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  uint32_t flags,
 				  const char *servername,
@@ -4643,7 +4643,7 @@ static WERROR enumprinters_level4(TALLOC_CTX *mem_ctx,
  ********************************************************************/
 
 static WERROR enumprinters_level5(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  uint32_t flags,
 				  const char *servername,
@@ -4663,7 +4663,7 @@ static WERROR enumprinters_level5(TALLOC_CTX *mem_ctx,
 WERROR _spoolss_EnumPrinters(struct pipes_struct *p,
 			     struct spoolss_EnumPrinters *r)
 {
-	const struct auth_serversupplied_info *session_info = get_session_info_system();
+	const struct auth3_session_info *session_info = get_session_info_system();
 	WERROR result;
 
 	/* that's an [in out] buffer */
@@ -5533,7 +5533,7 @@ static WERROR fill_printer_driver_info101(TALLOC_CTX *mem_ctx,
  ********************************************************************/
 
 static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
-						  const struct auth_serversupplied_info *session_info,
+						  const struct auth3_session_info *session_info,
 						  struct messaging_context *msg_ctx,
 						  uint32_t level,
 						  union spoolss_DriverInfo *r,
@@ -5908,7 +5908,7 @@ WERROR _spoolss_WritePrinter(struct pipes_struct *p,
 static WERROR control_printer(struct policy_handle *handle, uint32_t command,
 			      struct pipes_struct *p)
 {
-	const struct auth_serversupplied_info *session_info = p->session_info;
+	const struct auth3_session_info *session_info = p->session_info;
 	int snum;
 	WERROR errcode = WERR_BADFUNC;
 	struct printer_handle *Printer = find_printer_index_by_hnd(p, handle);
@@ -6271,7 +6271,7 @@ static bool add_printer_hook(TALLOC_CTX *ctx, struct security_token *token,
 }
 
 static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
-			       const struct auth_serversupplied_info *session_info,
+			       const struct auth3_session_info *session_info,
 			       struct messaging_context *msg_ctx,
 			       int snum,
 			       struct spoolss_SetPrinterInfo2 *printer,
@@ -7248,7 +7248,7 @@ static WERROR spoolss_setjob_1(TALLOC_CTX *mem_ctx,
 WERROR _spoolss_SetJob(struct pipes_struct *p,
 		       struct spoolss_SetJob *r)
 {
-	const struct auth_serversupplied_info *session_info = p->session_info;
+	const struct auth3_session_info *session_info = p->session_info;
 	int snum;
 	WERROR errcode = WERR_BADFUNC;
 
@@ -7319,7 +7319,7 @@ WERROR _spoolss_SetJob(struct pipes_struct *p,
 ****************************************************************************/
 
 static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx,
-						       const struct auth_serversupplied_info *session_info,
+						       const struct auth3_session_info *session_info,
 						       struct messaging_context *msg_ctx,
 						       const char *servername,
 						       const char *architecture,
@@ -7445,7 +7445,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx,
 ****************************************************************************/
 
 static WERROR enumprinterdrivers_level(TALLOC_CTX *mem_ctx,
-				       const struct auth_serversupplied_info *session_info,
+				       const struct auth3_session_info *session_info,
 				       struct messaging_context *msg_ctx,
 				       const char *servername,
 				       const char *architecture,
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index c1485de741..386ecb776b 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -28,7 +28,7 @@
 #include "rpc_client/cli_winreg_spoolss.h"
 
 WERROR winreg_printer_binding_handle(TALLOC_CTX *mem_ctx,
-				     const struct auth_serversupplied_info *session_info,
+				     const struct auth3_session_info *session_info,
 				     struct messaging_context *msg_ctx,
 				     struct dcerpc_binding_handle **winreg_binding_handle)
 {
@@ -61,7 +61,7 @@ WERROR winreg_printer_binding_handle(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_delete_printer_key_internal(TALLOC_CTX *mem_ctx,
-					  const struct auth_serversupplied_info *session_info,
+					  const struct auth3_session_info *session_info,
 					  struct messaging_context *msg_ctx,
 					  const char *printer,
 					  const char *key)
@@ -78,7 +78,7 @@ WERROR winreg_delete_printer_key_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_printer_update_changeid_internal(TALLOC_CTX *mem_ctx,
-					       const struct auth_serversupplied_info *session_info,
+					       const struct auth3_session_info *session_info,
 					       struct messaging_context *msg_ctx,
 					       const char *printer)
 {
@@ -93,7 +93,7 @@ WERROR winreg_printer_update_changeid_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_printer_get_changeid_internal(TALLOC_CTX *mem_ctx,
-					    const struct auth_serversupplied_info *session_info,
+					    const struct auth3_session_info *session_info,
 					    struct messaging_context *msg_ctx,
 					    const char *printer,
 					    uint32_t *pchangeid)
@@ -110,7 +110,7 @@ WERROR winreg_printer_get_changeid_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_get_printer_internal(TALLOC_CTX *mem_ctx,
-				   const struct auth_serversupplied_info *session_info,
+				   const struct auth3_session_info *session_info,
 				   struct messaging_context *msg_ctx,
 				   const char *printer,
 				   struct spoolss_PrinterInfo2 **pinfo2)
@@ -128,7 +128,7 @@ WERROR winreg_get_printer_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_create_printer_internal(TALLOC_CTX *mem_ctx,
-				      const struct auth_serversupplied_info *session_info,
+				      const struct auth3_session_info *session_info,
 				      struct messaging_context *msg_ctx,
 				      const char *sharename)
 {
@@ -143,7 +143,7 @@ WERROR winreg_create_printer_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_update_printer_internal(TALLOC_CTX *mem_ctx,
-				      const struct auth_serversupplied_info *session_info,
+				      const struct auth3_session_info *session_info,
 				      struct messaging_context *msg_ctx,
 				      const char *sharename,
 				      uint32_t info2_mask,
@@ -166,7 +166,7 @@ WERROR winreg_update_printer_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_set_printer_dataex_internal(TALLOC_CTX *mem_ctx,
-					  const struct auth_serversupplied_info *session_info,
+					  const struct auth3_session_info *session_info,
 					  struct messaging_context *msg_ctx,
 					  const char *printer,
 					  const char *key,
@@ -191,7 +191,7 @@ WERROR winreg_set_printer_dataex_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_enum_printer_dataex_internal(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *printer,
 					   const char *key,
@@ -212,7 +212,7 @@ WERROR winreg_enum_printer_dataex_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_get_printer_dataex_internal(TALLOC_CTX *mem_ctx,
-					  const struct auth_serversupplied_info *session_info,
+					  const struct auth3_session_info *session_info,
 					  struct messaging_context *msg_ctx,
 					  const char *printer,
 					  const char *key,
@@ -237,7 +237,7 @@ WERROR winreg_get_printer_dataex_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_delete_printer_dataex_internal(TALLOC_CTX *mem_ctx,
-					     const struct auth_serversupplied_info *session_info,
+					     const struct auth3_session_info *session_info,
 					     struct messaging_context *msg_ctx,
 					     const char *printer,
 					     const char *key,
@@ -256,7 +256,7 @@ WERROR winreg_delete_printer_dataex_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_get_driver_internal(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  const char *architecture,
 				  const char *driver_name,
@@ -277,7 +277,7 @@ WERROR winreg_get_driver_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_get_driver_list_internal(TALLOC_CTX *mem_ctx,
-				       const struct auth_serversupplied_info *session_info,
+				       const struct auth3_session_info *session_info,
 				       struct messaging_context *msg_ctx,
 				       const char *architecture,
 				       uint32_t version,
@@ -298,7 +298,7 @@ WERROR winreg_get_driver_list_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_del_driver_internal(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  struct spoolss_DriverInfo8 *info8,
 				  uint32_t version)
@@ -315,7 +315,7 @@ WERROR winreg_del_driver_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_add_driver_internal(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  struct spoolss_AddDriverInfoCtr *r,
 				  const char **driver_name,
@@ -334,7 +334,7 @@ WERROR winreg_add_driver_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_get_printer_secdesc_internal(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *sharename,
 					   struct spoolss_security_descriptor **psecdesc)
@@ -351,7 +351,7 @@ WERROR winreg_get_printer_secdesc_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_set_printer_secdesc_internal(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *sharename,
 					   const struct spoolss_security_descriptor *secdesc)
@@ -368,7 +368,7 @@ WERROR winreg_set_printer_secdesc_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_printer_enumforms1_internal(TALLOC_CTX *mem_ctx,
-					  const struct auth_serversupplied_info *session_info,
+					  const struct auth3_session_info *session_info,
 					  struct messaging_context *msg_ctx,
 					  uint32_t *pnum_info,
 					  union spoolss_FormInfo **pinfo)
@@ -385,7 +385,7 @@ WERROR winreg_printer_enumforms1_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_printer_getform1_internal(TALLOC_CTX *mem_ctx,
-					const struct auth_serversupplied_info *session_info,
+					const struct auth3_session_info *session_info,
 					struct messaging_context *msg_ctx,
 					const char *form_name,
 					struct spoolss_FormInfo1 *r)
@@ -402,7 +402,7 @@ WERROR winreg_printer_getform1_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_printer_addform1_internal(TALLOC_CTX *mem_ctx,
-					const struct auth_serversupplied_info *session_info,
+					const struct auth3_session_info *session_info,
 					struct messaging_context *msg_ctx,
 					struct spoolss_AddFormInfo1 *form)
 {
@@ -417,7 +417,7 @@ WERROR winreg_printer_addform1_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_printer_setform1_internal(TALLOC_CTX *mem_ctx,
-					const struct auth_serversupplied_info *session_info,
+					const struct auth3_session_info *session_info,
 					struct messaging_context *msg_ctx,
 					const char *form_name,
 					struct spoolss_AddFormInfo1 *form)
@@ -434,7 +434,7 @@ WERROR winreg_printer_setform1_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_printer_deleteform1_internal(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *form_name)
 {
@@ -449,7 +449,7 @@ WERROR winreg_printer_deleteform1_internal(TALLOC_CTX *mem_ctx,
 }
 
 WERROR winreg_enum_printer_key_internal(TALLOC_CTX *mem_ctx,
-					const struct auth_serversupplied_info *session_info,
+					const struct auth3_session_info *session_info,
 					struct messaging_context *msg_ctx,
 					const char *printer,
 					const char *key,
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.h b/source3/rpc_server/spoolss/srv_spoolss_util.h
index 2ae3a60499..74d80c83a6 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.h
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.h
@@ -22,39 +22,39 @@
 #ifndef _SRV_SPOOLSS_UITL_H
 #define _SRV_SPOOLSS_UITL_H
 
-struct auth_serversupplied_info;
+struct auth3_session_info;
 struct dcerpc_binding_handle;
 
 WERROR winreg_printer_binding_handle(TALLOC_CTX *mem_ctx,
-				     const struct auth_serversupplied_info *session_info,
+				     const struct auth3_session_info *session_info,
 				     struct messaging_context *msg_ctx,
 				     struct dcerpc_binding_handle **winreg_binding_handle);
 
 WERROR winreg_delete_printer_key_internal(TALLOC_CTX *mem_ctx,
-					  const struct auth_serversupplied_info *session_info,
+					  const struct auth3_session_info *session_info,
 					  struct messaging_context *msg_ctx,
 					  const char *printer,
 					  const char *key);
 WERROR winreg_printer_update_changeid_internal(TALLOC_CTX *mem_ctx,
-					       const struct auth_serversupplied_info *session_info,
+					       const struct auth3_session_info *session_info,
 					       struct messaging_context *msg_ctx,
 					       const char *printer);
 WERROR winreg_printer_get_changeid_internal(TALLOC_CTX *mem_ctx,
-					    const struct auth_serversupplied_info *session_info,
+					    const struct auth3_session_info *session_info,
 					    struct messaging_context *msg_ctx,
 					    const char *printer,
 					    uint32_t *pchangeid);
 WERROR winreg_get_printer_internal(TALLOC_CTX *mem_ctx,
-				   const struct auth_serversupplied_info *session_info,
+				   const struct auth3_session_info *session_info,
 				   struct messaging_context *msg_ctx,
 				   const char *printer,
 				   struct spoolss_PrinterInfo2 **pinfo2);
 WERROR winreg_create_printer_internal(TALLOC_CTX *mem_ctx,
-				      const struct auth_serversupplied_info *session_info,
+				      const struct auth3_session_info *session_info,
 				      struct messaging_context *msg_ctx,
 				      const char *sharename);
 WERROR winreg_update_printer_internal(TALLOC_CTX *mem_ctx,
-				      const struct auth_serversupplied_info *session_info,
+				      const struct auth3_session_info *session_info,
 				      struct messaging_context *msg_ctx,
 				      const char *sharename,
 				      uint32_t info2_mask,
@@ -62,7 +62,7 @@ WERROR winreg_update_printer_internal(TALLOC_CTX *mem_ctx,
 				      struct spoolss_DeviceMode *devmode,
 				      struct security_descriptor *secdesc);
 WERROR winreg_set_printer_dataex_internal(TALLOC_CTX *mem_ctx,
-					  const struct auth_serversupplied_info *session_info,
+					  const struct auth3_session_info *session_info,
 					  struct messaging_context *msg_ctx,
 					  const char *printer,
 					  const char *key,
@@ -71,14 +71,14 @@ WERROR winreg_set_printer_dataex_internal(TALLOC_CTX *mem_ctx,
 					  uint8_t *data,
 					  uint32_t data_size);
 WERROR winreg_enum_printer_dataex_internal(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *printer,
 					   const char *key,
 					   uint32_t *pnum_values,
 					   struct spoolss_PrinterEnumValues **penum_values);
 WERROR winreg_get_printer_dataex_internal(TALLOC_CTX *mem_ctx,
-					  const struct auth_serversupplied_info *session_info,
+					  const struct auth3_session_info *session_info,
 					  struct messaging_context *msg_ctx,
 					  const char *printer,
 					  const char *key,
@@ -87,71 +87,71 @@ WERROR winreg_get_printer_dataex_internal(TALLOC_CTX *mem_ctx,
 					  uint8_t **data,
 					  uint32_t *data_size);
 WERROR winreg_delete_printer_dataex_internal(TALLOC_CTX *mem_ctx,
-					     const struct auth_serversupplied_info *session_info,
+					     const struct auth3_session_info *session_info,
 					     struct messaging_context *msg_ctx,
 					     const char *printer,
 					     const char *key,
 					     const char *value);
 WERROR winreg_get_driver_internal(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  const char *architecture,
 				  const char *driver_name,
 				  uint32_t driver_version,
 				  struct spoolss_DriverInfo8 **_info8);
 WERROR winreg_get_driver_list_internal(TALLOC_CTX *mem_ctx,
-				       const struct auth_serversupplied_info *session_info,
+				       const struct auth3_session_info *session_info,
 				       struct messaging_context *msg_ctx,
 				       const char *architecture,
 				       uint32_t version,
 				       uint32_t *num_drivers,
 				       const char ***drivers_p);
 WERROR winreg_del_driver_internal(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  struct spoolss_DriverInfo8 *info8,
 				  uint32_t version);
 WERROR winreg_add_driver_internal(TALLOC_CTX *mem_ctx,
-				  const struct auth_serversupplied_info *session_info,
+				  const struct auth3_session_info *session_info,
 				  struct messaging_context *msg_ctx,
 				  struct spoolss_AddDriverInfoCtr *r,
 				  const char **driver_name,
 				  uint32_t *driver_version);
 WERROR winreg_get_printer_secdesc_internal(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *sharename,
 					   struct spoolss_security_descriptor **psecdesc);
 WERROR winreg_set_printer_secdesc_internal(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *sharename,
 					   const struct spoolss_security_descriptor *secdesc);
 WERROR winreg_printer_enumforms1_internal(TALLOC_CTX *mem_ctx,
-					  const struct auth_serversupplied_info *session_info,
+					  const struct auth3_session_info *session_info,
 					  struct messaging_context *msg_ctx,
 					  uint32_t *pnum_info,
 					  union spoolss_FormInfo **pinfo);
 WERROR winreg_printer_getform1_internal(TALLOC_CTX *mem_ctx,
-					const struct auth_serversupplied_info *session_info,
+					const struct auth3_session_info *session_info,
 					struct messaging_context *msg_ctx,
 					const char *form_name,
 					struct spoolss_FormInfo1 *r);
 WERROR winreg_printer_addform1_internal(TALLOC_CTX *mem_ctx,
-					const struct auth_serversupplied_info *session_info,
+					const struct auth3_session_info *session_info,
 					struct messaging_context *msg_ctx,
 					struct spoolss_AddFormInfo1 *form);
 WERROR winreg_printer_setform1_internal(TALLOC_CTX *mem_ctx,
-					const struct auth_serversupplied_info *session_info,
+					const struct auth3_session_info *session_info,
 					struct messaging_context *msg_ctx,
 					const char *form_name,
 					struct spoolss_AddFormInfo1 *form);
 WERROR winreg_printer_deleteform1_internal(TALLOC_CTX *mem_ctx,
-					   const struct auth_serversupplied_info *session_info,
+					   const struct auth3_session_info *session_info,
 					   struct messaging_context *msg_ctx,
 					   const char *form_name);
 WERROR winreg_enum_printer_key_internal(TALLOC_CTX *mem_ctx,
-					const struct auth_serversupplied_info *session_info,
+					const struct auth3_session_info *session_info,
 					struct messaging_context *msg_ctx,
 					const char *printer,
 					const char *key,