Revert "vuid => session_id"

This reverts commit f75fc237481172b58460e1c1b54d4e9bc16f24ee.

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 372386d21269512f6069aff9751376656414dcec..147a063e40da4ed0c4bcc150fb04b2fbb0cf56db 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -230,7 +230,7 @@ typedef struct files_struct {
        struct file_id file_id;
        uint64_t initial_allocation_size; /* Faked up initial allocation on disk. */
        uint16 file_pid;
-       uint64_t session_id; /* for compat with SMB2 */
+       uint16 vuid;
        write_cache *wcp;
        struct timeval open_time;
        uint32 access_mask;             /* NTCreateX access bits (FILE_READ_DATA etc.) */
@@ -292,7 +292,7 @@ typedef struct files_struct {
 
 struct vuid_cache_entry {
        struct auth_session_info *session_info;
-       uint64_t session_id;
+       uint16_t vuid;
        bool read_only;
 };
 
@@ -397,7 +397,7 @@ typedef struct connection_struct {
         */
        gid_t force_group_gid;
 
-       uint64_t session_id; /* vuid of user who *opened* this connection, or UID_FIELD_INVALID */
+       uint16 vuid; /* vuid of user who *opened* this connection, or UID_FIELD_INVALID */
 
        time_t lastused;
        time_t lastused_count;
@@ -431,7 +431,7 @@ typedef struct connection_struct {
 
 struct current_user {
        connection_struct *conn;
-       uint64_t session_id;
+       uint16 vuid;
        struct security_unix_token ut;
        struct security_token *nt_user_token;
 };
@@ -445,7 +445,7 @@ struct smb_request {
        uint16 smbpid;
        uint64_t mid; /* For compatibility with SMB2. */
        uint32_t seqnum;
-       uint64_t session_id;
+       uint16 vuid;
        uint16 tid;
        uint8  wct;
        const uint16_t *vwv;
@@ -1220,7 +1220,7 @@ struct node_status_extra {
 
 typedef struct user_struct {
        struct user_struct *next, *prev;
-       uint64_t session_id; /* Tag for this entry. */
+       uint16 vuid; /* Tag for this entry. */
 
        char *session_keystr; /* used by utmp and pam session code.  
                                 TDB key string */