diff options
| author | Jeremy Allison <jra@samba.org> | 2009-07-14 11:25:45 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-07-14 11:25:45 -0700 |
| commit | d57e67f9eb5a6a05f0e173d48e86dd1fe050635e (patch) | |
| tree | 4afa76c7ebeb407d9a7178f1747aafe413a9e5b7 /source3/include | |
| parent | 73e96935c3604d21552ba93dfd561eaf7606f52d (diff) | |
| download | samba-d57e67f9eb5a6a05f0e173d48e86dd1fe050635e.tar.gz samba-d57e67f9eb5a6a05f0e173d48e86dd1fe050635e.tar.bz2 samba-d57e67f9eb5a6a05f0e173d48e86dd1fe050635e.zip | |
Revert this commit :
s3: Make smbd aware of permission change of usershare. Since usershare are relatively volatile and
non-previledge users must disconnect from smbd and reconnect to it to make share permission in effect.
For now. This is a feature request and I think we need
to design it a little differently so as not to touch
core change_to_user() code.
Jeremy.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 7 | ||||
| -rw-r--r-- | source3/include/smb.h | 6 |
2 files changed, 1 insertions, 12 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index d141de44cf..0dd1e98c86 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4296,7 +4296,6 @@ enum usershare_err parse_usershare_file(TALLOC_CTX *ctx, char **pp_comment, SEC_DESC **ppsd, bool *pallow_guest); -bool am_usershare(int iService); int load_usershare_service(const char *servicename); int load_usershare_shares(void); void gfree_loadparm(void); @@ -7064,8 +7063,7 @@ void reply_transs2(struct smb_request *req); bool change_to_guest(void); void conn_clear_vuid_cache(connection_struct *conn, uint16_t vuid); -bool change_to_user_force_recheck(connection_struct *conn, uint16 vuid, - bool recheck, NTSTATUS *pstatus); +bool change_to_user(connection_struct *conn, uint16 vuid); bool change_to_root_user(void); bool become_authenticated_pipe_user(pipes_struct *p); bool unbecome_authenticated_pipe_user(void); @@ -7074,9 +7072,6 @@ void unbecome_root(void); bool become_user(connection_struct *conn, uint16 vuid); bool unbecome_user(void); -#define change_to_user(conn, vuid) \ - change_to_user_force_recheck(conn, vuid, 0, NULL) - /* The following definitions come from smbd/utmp.c */ void sys_utmp_claim(const char *username, const char *hostname, diff --git a/source3/include/smb.h b/source3/include/smb.h index 44216f856a..2e9cf1b54a 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -550,7 +550,6 @@ typedef struct connection_struct { unsigned cnum; /* an index passed over the wire */ struct share_params *params; bool force_user; - bool force_recheck_perm; struct vuid_cache vuid_cache; struct dptr_struct *dirptr; bool printer; @@ -1399,11 +1398,6 @@ struct bitmap { #define FILE_NOTIFY_CHANGE_STREAM_NAME 0x00000200 #define FILE_NOTIFY_CHANGE_STREAM_SIZE 0x00000400 #define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800 -#define FILE_NOTIFY_CHANGE_FILE_CONTENT \ - (FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME \ - | FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE \ - | FILE_NOTIFY_CHANGE_CREATION | FILE_NOTIFY_CHANGE_EA \ - | FILE_NOTIFY_CHANGE_SECURITY) #define FILE_NOTIFY_CHANGE_NAME \ (FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_DIR_NAME) |