summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-12-21 09:22:16 -0800
committerAndrew Bartlett <abartlet@samba.org>2013-01-09 15:28:48 +1100
commit4983d5838afcab8c675cace0723a3fc284667bec (patch)
tree940d7b474860e8c1c65ae65877598cd810ccbc67
parent7d90ae123af115bdcb1cdcd025cf73fdbf22b142 (diff)
downloadsamba-4983d5838afcab8c675cace0723a3fc284667bec.tar.gz
samba-4983d5838afcab8c675cace0723a3fc284667bec.tar.bz2
samba-4983d5838afcab8c675cace0723a3fc284667bec.zip
Add uint32_t share_access to vuid_cache_entry.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/include/vfs.h2
-rw-r--r--source3/modules/vfs_readonly.c1
-rw-r--r--source3/smbd/conn.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 7da022ef37..2bce1b7956 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -150,6 +150,7 @@
/* Bump to version 31 - Samba 4.1.0 will ship with interface version 31 */
/* Leave at 31 - not yet released. Make struct vuid_cache_entry in
connection_struct a pointer. */
+/* Leave at 31 - not yet released. Add share_access to vuid_cache_entry. */
#define SMB_VFS_INTERFACE_VERSION 31
@@ -279,6 +280,7 @@ struct vuid_cache_entry {
struct auth_session_info *session_info;
uint64_t vuid; /* SMB2 compat */
bool read_only;
+ uint32_t share_access;
};
struct vuid_cache {
diff --git a/source3/modules/vfs_readonly.c b/source3/modules/vfs_readonly.c
index f75db093cc..445f947810 100644
--- a/source3/modules/vfs_readonly.c
+++ b/source3/modules/vfs_readonly.c
@@ -86,6 +86,7 @@ static int readonly_connect(vfs_handle_struct *handle,
ent->vuid = UID_FIELD_INVALID;
TALLOC_FREE(ent->session_info);
ent->read_only = false;
+ ent->share_access = 0;
}
conn->vuid_cache->next_entry = 0;
}
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 1d4444f368..8f472c0d24 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -118,6 +118,7 @@ static void conn_clear_vuid_cache(connection_struct *conn, uint64_t vuid)
TALLOC_FREE(ent->session_info);
}
ent->read_only = False;
+ ent->share_access = 0;
}
}
}