sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Fix bug #5900 reported by monyo@samba.gr.jp - vfs_readonly.so does not work.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 2008-11-17 14:13:20 -08:00
parent a48abdaa81
commit d8df43e65d
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/proto.h
View File

@ -8459,7 +8459,8 @@ bool user_ok_token(const char *username, const char *domain,
struct nt_user_token *token, int snum);
bool is_share_read_only_for_token(const char *username,
const char *domain,
struct nt_user_token *token, int snum);
struct nt_user_token *token,
connection_struct *conn);
/* The following definitions come from smbd/srvstr.c */

13
source3/modules/vfs_readonly.c
View File

@ -64,12 +64,25 @@ static int readonly_connect(vfs_handle_struct *handle,
"period", period_def);
if (period && period[0] && period[1]) {
int i;
time_t current_time = time(NULL);
time_t begin_period = get_date(period[0], &current_time);
time_t end_period = get_date(period[1], &current_time);
if ((current_time >= begin_period) && (current_time <= end_period)) {
connection_struct *conn = handle->conn;
handle->conn->read_only = True;
/* Wipe out the VUID cache. */
for (i=0; i< VUID_CACHE_SIZE; i++) {
struct vuid_cache_entry *ent = ent = &conn->vuid_cache.array[i];
ent->vuid = UID_FIELD_INVALID;
TALLOC_FREE(ent->server_info);
ent->read_only = false;
ent->admin_user = false;
}
conn->vuid_cache.next_entry = 0;
}
return SMB_VFS_NEXT_CONNECT(handle, service, user);

6
source3/smbd/share_access.c
View File

@ -252,9 +252,11 @@ bool user_ok_token(const char *username, const char *domain,
bool is_share_read_only_for_token(const char *username,
const char *domain,
struct nt_user_token *token, int snum)
struct nt_user_token *token,
connection_struct *conn)
{
bool result = lp_readonly(snum);
int snum = SNUM(conn);
bool result = conn->read_only;
if (lp_readlist(snum) != NULL) {
if (token_contains_name_in_list(username, domain,

3
source3/smbd/uid.c
View File

@ -88,7 +88,8 @@ static bool check_user_ok(connection_struct *conn, uint16_t vuid,
readonly_share = is_share_read_only_for_token(
server_info->unix_name,
pdb_get_domain(server_info->sam_account),
server_info->ptok, snum);
server_info->ptok,
conn);
if (!readonly_share &&
!share_access_check(server_info->ptok, lp_servicename(snum),