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>

2 files changed, 11 insertions, 11 deletions

diff --git a/source3/services/svc_winreg_glue.c b/source3/services/svc_winreg_glue.c
index 06f3f9195f9..c4cd46d70d2 100644
--- a/source3/services/svc_winreg_glue.c
+++ b/source3/services/svc_winreg_glue.c
@@ -77,7 +77,7 @@ struct security_descriptor* svcctl_gen_service_sd(TALLOC_CTX *mem_ctx)
 
 struct security_descriptor *svcctl_get_secdesc(TALLOC_CTX *mem_ctx,
 					       struct messaging_context *msg_ctx,
-					       const struct auth_serversupplied_info *session_info,
+					       const struct auth3_session_info *session_info,
 					       const char *name)
 {
 	struct dcerpc_binding_handle *h = NULL;
@@ -147,7 +147,7 @@ done:
 }
 
 bool svcctl_set_secdesc(struct messaging_context *msg_ctx,
-			const struct auth_serversupplied_info *session_info,
+			const struct auth3_session_info *session_info,
 			const char *name,
 			struct security_descriptor *sd)
 {
@@ -259,7 +259,7 @@ done:
 
 const char *svcctl_get_string_value(TALLOC_CTX *mem_ctx,
 				    struct messaging_context *msg_ctx,
-				    const struct auth_serversupplied_info *session_info,
+				    const struct auth3_session_info *session_info,
 				    const char *key_name,
 				    const char *value_name)
 {
@@ -321,7 +321,7 @@ done:
 
 const char *svcctl_lookup_dispname(TALLOC_CTX *mem_ctx,
 				   struct messaging_context *msg_ctx,
-				   const struct auth_serversupplied_info *session_info,
+				   const struct auth3_session_info *session_info,
 				   const char *name)
 {
 	const char *display_name = NULL;
@@ -344,7 +344,7 @@ const char *svcctl_lookup_dispname(TALLOC_CTX *mem_ctx,
 
 const char *svcctl_lookup_description(TALLOC_CTX *mem_ctx,
 				      struct messaging_context *msg_ctx,
-				      const struct auth_serversupplied_info *session_info,
+				      const struct auth3_session_info *session_info,
 				      const char *name)
 {
 	const char *description = NULL;
diff --git a/source3/services/svc_winreg_glue.h b/source3/services/svc_winreg_glue.h
index 4ff9e27c402..e17d6692dcf 100644
--- a/source3/services/svc_winreg_glue.h
+++ b/source3/services/svc_winreg_glue.h
@@ -24,34 +24,34 @@
 #ifndef SVC_WINREG_GLUE_H
 #define SVC_WINREG_GLUE_H
 
-struct auth_serversupplied_info;
+struct auth3_session_info;
 
 struct security_descriptor* svcctl_gen_service_sd(TALLOC_CTX *mem_ctx);
 
 struct security_descriptor *svcctl_get_secdesc(TALLOC_CTX *mem_ctx,
 					       struct messaging_context *msg_ctx,
-					       const struct auth_serversupplied_info *session_info,
+					       const struct auth3_session_info *session_info,
 					       const char *name);
 
 bool svcctl_set_secdesc(struct messaging_context *msg_ctx,
-			const struct auth_serversupplied_info *session_info,
+			const struct auth3_session_info *session_info,
 			const char *name,
 			struct security_descriptor *sd);
 
 const char *svcctl_get_string_value(TALLOC_CTX *mem_ctx,
 				    struct messaging_context *msg_ctx,
-				    const struct auth_serversupplied_info *session_info,
+				    const struct auth3_session_info *session_info,
 				    const char *key_name,
 				    const char *value_name);
 
 const char *svcctl_lookup_dispname(TALLOC_CTX *mem_ctx,
 				   struct messaging_context *msg_ctx,
-				   const struct auth_serversupplied_info *session_info,
+				   const struct auth3_session_info *session_info,
 				   const char *name);
 
 const char *svcctl_lookup_description(TALLOC_CTX *mem_ctx,
 				      struct messaging_context *msg_ctx,
-				      const struct auth_serversupplied_info *session_info,
+				      const struct auth3_session_info *session_info,
 				      const char *name);
 
 #endif /* SVC_WINREG_GLUE_H */