s3-auth struct security_unix_token replaces UNIX_USER_TOKEN

diff --git a/source3/include/auth.h b/source3/include/auth.h
index 93e42b8f27580ef768511bdf84f9aa65d0d0cd6e..3b3f6dc6d1b4584468404e6006879f68ca2c3d2a 100644 (file)
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -30,7 +30,7 @@ struct auth_serversupplied_info {
        bool guest;
        bool system;
 
-       struct unix_user_token utok;
+       struct security_unix_token utok;
 
        /* NT group information taken from the info3 structure */
 

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0d710fc3e11a8475e307fbea2832519f6e737c2d..3ff8d0bdc196b1464dc6d1d0ec9c03d197ae2966 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5648,7 +5648,7 @@ NTSTATUS access_check_object( struct security_descriptor *psd, struct security_t
                              uint32 des_access, uint32 *acc_granted,
                              const char *debug );
 void map_max_allowed_access(const struct security_token *nt_token,
-                           const struct unix_user_token *unix_token,
+                           const struct security_unix_token *unix_token,
                            uint32_t *pacc_requested);
 
 /* The following definitions come from ../libds/common/flag_mapping.c  */

diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index d53d859f5526c6be31ea975973a49bf5f7e18770..57965cda7416171525f5e496a2dceb3ac881d1d4 100644 (file)
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -250,7 +250,7 @@ done:
 ********************************************************************/
 
 void map_max_allowed_access(const struct security_token *nt_token,
-                           const struct unix_user_token *unix_token,
+                           const struct security_unix_token *unix_token,
                            uint32_t *pacc_requested)
 {
        if (!((*pacc_requested) & MAXIMUM_ALLOWED_ACCESS)) {

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index c326846825266a53933dae051d88289d2d593b2a..04a70598ded97a1fdb3d4ebc4ae34658a106df21 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -76,7 +76,7 @@ extern struct smb_srv_trans_enc_ctx *partial_srv_trans_enc_ctx;
 extern struct smb_srv_trans_enc_ctx *srv_trans_enc_ctx;
 
 struct sec_ctx {
-       UNIX_USER_TOKEN ut;
+       struct security_unix_token ut;
        struct security_token *token;
 };
 /* A stack of security contexts.  We include the current context as being