diff options
| author | Jeremy Allison <jra@samba.org> | 2010-03-05 15:10:30 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-03-05 15:13:37 -0800 |
| commit | c61c9c3a4cda79fb82adf59bcb563d85797b9b76 (patch) | |
| tree | 3049052ca5181e9229d48de841c5635eef3ba055 /source3/include/smb.h | |
| parent | 95f22262656f38e5e0ea0b918ee68e958a9277f4 (diff) | |
| download | samba-c61c9c3a4cda79fb82adf59bcb563d85797b9b76.tar.gz samba-c61c9c3a4cda79fb82adf59bcb563d85797b9b76.tar.bz2 samba-c61c9c3a4cda79fb82adf59bcb563d85797b9b76.zip | |
Fix for bug #7189 - Open txt files with notepad on samba shares creates problem.
Ensure we don't use any of the create_options for Samba private
use. Add a new parameter to the VFS_CREATE call (private_flags)
which is only used internally. Renumber NTCREATEX_OPTIONS_PRIVATE_DENY_DOS
and NTCREATEX_OPTIONS_PRIVATE_DENY_FCB to match the S4 code).
Rev. the VFS interface to version 28.
Jeremy.
Diffstat (limited to 'source3/include/smb.h')
| -rw-r--r-- | source3/include/smb.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index de998cbe0a..8d1e148259 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -344,7 +344,8 @@ struct fd_handle { SMB_OFF_T pos; uint32 private_options; /* NT Create options, but we only look at * NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and - * NTCREATEX_OPTIONS_PRIVATE_DENY_FCB (Except + * NTCREATEX_OPTIONS_PRIVATE_DENY_FCB and + * NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE * for print files *only*, where * DELETE_ON_CLOSE is not stored in the share * mode database. @@ -1372,13 +1373,17 @@ struct bitmap { /* * Private create options used by the ntcreatex processing code. From Samba4. - * We reuse some ignored flags for private use. + * We reuse some ignored flags for private use. Passed in the private_flags + * argument. */ -#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x00010000 -#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x00020000 +#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0001 +#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0002 /* Private options for streams support */ -#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x00040000 +#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x0004 + +/* Private options for printer support */ +#define NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE 0x0008 /* Responses when opening a file. */ #define FILE_WAS_SUPERSEDED 0 |