s3-auth Rename auth_serversupplied_info varaiables: server_info -> session_info

These variables, of type struct auth_serversupplied_info were poorly
named when added into 2001, and in good consistant practice, this has
extended all over the codebase in the years since.

The structure is also not ideal for it's current purpose.  Originally
intended to convey the results of the authentication modules, it
really describes all the essential attributes of a session.  This
rename will reduce the volume of a future patch to replaced these with
a struct auth_session_info, with auth_serversupplied_info confined to
the lower levels of the auth subsystem, and then eliminated.

(The new structure will be the output of create_local_token(), and the
change in struct definition will ensure that this is always run, populating
local groups and privileges).

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>

2 files changed, 15 insertions, 15 deletions

diff --git a/source3/services/svc_winreg_glue.c b/source3/services/svc_winreg_glue.c
index 2b35556caf..65f0388167 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 *server_info,
+					       const struct auth_serversupplied_info *session_info,
 					       const char *name)
 {
 	struct dcerpc_binding_handle *h = NULL;
@@ -96,7 +96,7 @@ struct security_descriptor *svcctl_get_secdesc(TALLOC_CTX *mem_ctx,
 	}
 
 	status = dcerpc_winreg_int_hklm_openkey(mem_ctx,
-						server_info,
+						session_info,
 						msg_ctx,
 						&h,
 						key,
@@ -147,7 +147,7 @@ done:
 }
 
 bool svcctl_set_secdesc(struct messaging_context *msg_ctx,
-			const struct auth_serversupplied_info *server_info,
+			const struct auth_serversupplied_info *session_info,
 			const char *name,
 			struct security_descriptor *sd)
 {
@@ -171,7 +171,7 @@ bool svcctl_set_secdesc(struct messaging_context *msg_ctx,
 	}
 
 	status = dcerpc_winreg_int_hklm_openkey(tmp_ctx,
-						server_info,
+						session_info,
 						msg_ctx,
 						&h,
 						key,
@@ -258,7 +258,7 @@ done:
 
 const char *svcctl_get_string_value(TALLOC_CTX *mem_ctx,
 				    struct messaging_context *msg_ctx,
-				    const struct auth_serversupplied_info *server_info,
+				    const struct auth_serversupplied_info *session_info,
 				    const char *key_name,
 				    const char *value_name)
 {
@@ -283,7 +283,7 @@ const char *svcctl_get_string_value(TALLOC_CTX *mem_ctx,
 	}
 
 	status = dcerpc_winreg_int_hklm_openkey(tmp_ctx,
-						server_info,
+						session_info,
 						msg_ctx,
 						&h,
 						path,
@@ -320,14 +320,14 @@ done:
 
 const char *svcctl_lookup_dispname(TALLOC_CTX *mem_ctx,
 				   struct messaging_context *msg_ctx,
-				   const struct auth_serversupplied_info *server_info,
+				   const struct auth_serversupplied_info *session_info,
 				   const char *name)
 {
 	const char *display_name = NULL;
 
 	display_name = svcctl_get_string_value(mem_ctx,
 					       msg_ctx,
-					       server_info,
+					       session_info,
 					       name,
 					       "DisplayName");
 
@@ -343,14 +343,14 @@ 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 *server_info,
+				      const struct auth_serversupplied_info *session_info,
 				      const char *name)
 {
 	const char *description = NULL;
 
 	description = svcctl_get_string_value(mem_ctx,
 					      msg_ctx,
-					      server_info,
+					      session_info,
 					      name,
 					      "Description");
 
diff --git a/source3/services/svc_winreg_glue.h b/source3/services/svc_winreg_glue.h
index f2f036e725..a4a1628cd3 100644
--- a/source3/services/svc_winreg_glue.h
+++ b/source3/services/svc_winreg_glue.h
@@ -28,28 +28,28 @@ 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 *server_info,
+					       const struct auth_serversupplied_info *session_info,
 					       const char *name);
 
 bool svcctl_set_secdesc(struct messaging_context *msg_ctx,
-			const struct auth_serversupplied_info *server_info,
+			const struct auth_serversupplied_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 *server_info,
+				    const struct auth_serversupplied_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 *server_info,
+				   const struct auth_serversupplied_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 *server_info,
+				      const struct auth_serversupplied_info *session_info,
 				      const char *name);
 
 #endif /* SVC_WINREG_GLUE_H */