From c90cd26e9430b2fc065f620bdb6aaf4be0372fcc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 23 Mar 2002 02:57:44 +0000 Subject: Fix the mp3 rename bug - also tidy up our open code and remove the special cases for rename and unlink. Had to add desired_access into the share mode record. Jeremy. (This used to be commit 3b1b8ac43535fb0839c5474fa55bf7150f6cde31) --- source3/include/smb.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source3/include/smb.h') diff --git a/source3/include/smb.h b/source3/include/smb.h index cd15a96be2..8963528e9a 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -123,11 +123,6 @@ typedef int BOOL; #define GET_DELETE_ON_CLOSE_FLAG(x) (((x) & DELETE_ON_CLOSE_FLAG) ? True : False) #define SET_DELETE_ON_CLOSE_FLAG(x) ((x) ? DELETE_ON_CLOSE_FLAG : 0) -/* was delete access requested in NT open ? */ -#define DELETE_ACCESS_REQUESTED (1<<17) -#define GET_DELETE_ACCESS_REQUESTED(x) (((x) & DELETE_ACCESS_REQUESTED) ? True : False) -#define SET_DELETE_ACCESS_REQUESTED(x) ((x) ? DELETE_ACCESS_REQUESTED : 0) - /* open disposition values */ #define FILE_EXISTS_FAIL 0 #define FILE_EXISTS_OPEN 1 @@ -386,6 +381,7 @@ typedef struct files_struct write_cache *wcp; struct timeval open_time; int share_mode; + uint32 desired_access; time_t pending_modtime; int oplock_type; int sent_oplock_break; @@ -553,6 +549,7 @@ typedef struct { uint16 op_port; uint16 op_type; int share_mode; + uint32 desired_access; struct timeval time; SMB_DEV_T dev; SMB_INO_T inode; @@ -1390,7 +1387,7 @@ extern int global_is_multibyte_codepage; #define COPYBUF_SIZE (8*1024) /* - * Integers used to override error codes. + * Values used to override error codes. */ extern int unix_ERR_class; extern int unix_ERR_code; -- cgit