s3:auth Remove NT_USER_TOKEN

The all UPPER case typedef is no longer the preferred Samba style
and this makes it easier to see that this is the IDL-derivied structure

Andrew Bartlett

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

4 files changed, 4 insertions, 4 deletions

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index c4d65aa565..923dd1763c 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -85,7 +85,7 @@ extern struct smb_srv_trans_enc_ctx *srv_trans_enc_ctx;
 
 struct sec_ctx {
 	UNIX_USER_TOKEN ut;
-	NT_USER_TOKEN *token;
+	struct security_token *token;
 };
 /* A stack of security contexts.  We include the current context as being
    the first one, so there is room for another MAX_SEC_CTX_DEPTH more. */
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 2009d2ab15..e9f0e6cd4f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -56,7 +56,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
 
 NTSTATUS smb1_file_se_access_check(struct connection_struct *conn,
 				const struct security_descriptor *sd,
-				const NT_USER_TOKEN *token,
+				const struct security_token *token,
 				uint32_t access_desired,
 				uint32_t *access_granted)
 {
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index 4b9e5d4727..017613cf1e 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -300,7 +300,7 @@ static void set_unix_security_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *grou
  Set the current security context to a given user.
 ****************************************************************************/
 
-void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, NT_USER_TOKEN *token)
+void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, struct security_token *token)
 {
 	struct sec_ctx *ctx_p = &sec_ctx_stack[sec_ctx_stack_ndx];
 	
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index d7ede293c1..3b40cefd36 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -538,7 +538,7 @@ const UNIX_USER_TOKEN *get_current_utok(connection_struct *conn)
 	return &current_user.ut;
 }
 
-const NT_USER_TOKEN *get_current_nttok(connection_struct *conn)
+const struct security_token *get_current_nttok(connection_struct *conn)
 {
 	return current_user.nt_user_token;
 }