s3-auth Use the common auth_session_info

This patch finally has the same structure being used to describe the
authorization data of a user across the whole codebase.

This will allow of our session handling to be accomplished with common code.

Andrew Bartlett

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

4 files changed, 21 insertions, 21 deletions

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 8bac857687..69e9f7f80f 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -128,18 +128,18 @@ bool nt_printing_init(struct messaging_context *msg_ctx);
 
 const char *get_short_archi(const char *long_archi);
 
-bool print_access_check(const struct auth3_session_info *server_info,
+bool print_access_check(const struct auth_session_info *server_info,
 			struct messaging_context *msg_ctx, int snum,
 			int access_type);
 
 WERROR nt_printer_publish(TALLOC_CTX *mem_ctx,
-			  const struct auth3_session_info *server_info,
+			  const struct auth_session_info *server_info,
 			  struct messaging_context *msg_ctx,
 			  struct spoolss_PrinterInfo2 *pinfo2,
 			  int action);
 
 bool is_printer_published(TALLOC_CTX *mem_ctx,
-			  const struct auth3_session_info *server_info,
+			  const struct auth_session_info *server_info,
 			  struct messaging_context *msg_ctx,
 			  const char *servername, char *printer, struct GUID *guid,
 			  struct spoolss_PrinterInfo2 **info2);
@@ -147,33 +147,33 @@ bool is_printer_published(TALLOC_CTX *mem_ctx,
 WERROR check_published_printers(struct messaging_context *msg_ctx);
 
 bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
-			   const struct auth3_session_info *server_info,
+			   const struct auth_session_info *server_info,
 			   struct messaging_context *msg_ctx,
 			   const struct spoolss_DriverInfo8 *r);
 bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
-				 const struct auth3_session_info *server_info,
+				 const struct auth_session_info *server_info,
 				 struct messaging_context *msg_ctx,
 				 struct spoolss_DriverInfo8 *r);
-bool delete_driver_files(const struct auth3_session_info *server_info,
+bool delete_driver_files(const struct auth_session_info *server_info,
 			 const struct spoolss_DriverInfo8 *r);
 
-WERROR move_driver_to_download_area(struct auth3_session_info *session_info,
+WERROR move_driver_to_download_area(struct auth_session_info *session_info,
 				    struct spoolss_AddDriverInfoCtr *r);
 
 WERROR clean_up_driver_struct(TALLOC_CTX *mem_ctx,
-			      struct auth3_session_info *session_info,
+			      struct auth_session_info *session_info,
 			      struct spoolss_AddDriverInfoCtr *r);
 
 void map_printer_permissions(struct security_descriptor *sd);
 
 void map_job_permissions(struct security_descriptor *sd);
 
-bool print_time_access_check(const struct auth3_session_info *server_info,
+bool print_time_access_check(const struct auth_session_info *server_info,
 			     struct messaging_context *msg_ctx,
 			     const char *servicename);
 
 void nt_printer_remove(TALLOC_CTX *mem_ctx,
-			const struct auth3_session_info *server_info,
+			const struct auth_session_info *server_info,
 			struct messaging_context *msg_ctx,
 			const char *printer);
 
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index a71c9a2e4a..6971305e07 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -115,7 +115,7 @@ struct pipes_struct {
 
 	enum dcerpc_transport_t transport;
 
-	struct auth3_session_info *session_info;
+	struct auth_session_info *session_info;
 	struct messaging_context *msg_ctx;
 
 	struct dcesrv_ep_entry_list *ep_entries;
diff --git a/source3/include/printing.h b/source3/include/printing.h
index 8075241092..0c81d07fbe 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -198,13 +198,13 @@ bool print_job_set_name(struct tevent_context *ev,
 			struct messaging_context *msg_ctx,
 			const char *sharename, uint32 jobid, const char *name);
 bool print_job_get_name(TALLOC_CTX *mem_ctx, const char *sharename, uint32_t jobid, char **name);
-WERROR print_job_delete(const struct auth3_session_info *server_info,
+WERROR print_job_delete(const struct auth_session_info *server_info,
 			struct messaging_context *msg_ctx,
 			int snum, uint32_t jobid);
-bool print_job_pause(const struct auth3_session_info *server_info,
+bool print_job_pause(const struct auth_session_info *server_info,
 		     struct messaging_context *msg_ctx,
 		     int snum, uint32 jobid, WERROR *errcode);
-bool print_job_resume(const struct auth3_session_info *server_info,
+bool print_job_resume(const struct auth_session_info *server_info,
 		      struct messaging_context *msg_ctx,
 		      int snum, uint32 jobid, WERROR *errcode);
 ssize_t print_job_write(struct tevent_context *ev,
@@ -212,7 +212,7 @@ ssize_t print_job_write(struct tevent_context *ev,
 			int snum, uint32 jobid, const char *buf, size_t size);
 int print_queue_length(struct messaging_context *msg_ctx, int snum,
 		       print_status_struct *pstatus);
-WERROR print_job_start(const struct auth3_session_info *server_info,
+WERROR print_job_start(const struct auth_session_info *server_info,
 		       struct messaging_context *msg_ctx,
 		       const char *clientmachine,
 		       int snum, const char *docname, const char *filename,
@@ -224,11 +224,11 @@ NTSTATUS print_job_end(struct messaging_context *msg_ctx, int snum,
 int print_queue_status(struct messaging_context *msg_ctx, int snum,
 		       print_queue_struct **ppqueue,
 		       print_status_struct *status);
-WERROR print_queue_pause(const struct auth3_session_info *server_info,
+WERROR print_queue_pause(const struct auth_session_info *server_info,
 			 struct messaging_context *msg_ctx, int snum);
-WERROR print_queue_resume(const struct auth3_session_info *server_info,
+WERROR print_queue_resume(const struct auth_session_info *server_info,
 			  struct messaging_context *msg_ctx, int snum);
-WERROR print_queue_purge(const struct auth3_session_info *server_info,
+WERROR print_queue_purge(const struct auth_session_info *server_info,
 			 struct messaging_context *msg_ctx, int snum);
 uint16 pjobid_to_rap(const char* sharename, uint32 jobid);
 bool rap_to_pjobid(uint16 rap_jobid, fstring sharename, uint32 *pjobid);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 3242c604d6..88521d4b97 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -305,7 +305,7 @@ typedef struct files_struct {
 #include "sysquotas.h"
 
 struct vuid_cache_entry {
-	struct auth3_session_info *session_info;
+	struct auth_session_info *session_info;
 	uint16_t vuid;
 	bool read_only;
 };
@@ -403,7 +403,7 @@ typedef struct connection_struct {
 	 * This represents the user information on this connection. Depending
 	 * on the vuid using this tid, this might change per SMB request.
 	 */
-	struct auth3_session_info *session_info;
+	struct auth_session_info *session_info;
 
 	/*
 	 * If the "force group" parameter is set, this is the primary gid that
@@ -1447,7 +1447,7 @@ typedef struct user_struct {
 				 TDB key string */
 	int homes_snum;
 
-	struct auth3_session_info *session_info;
+	struct auth_session_info *session_info;
 
 	struct auth_ntlmssp_state *auth_ntlmssp_state;
 } user_struct;