diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 18:31:12 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 18:31:12 +0200 |
| commit | ee4987ab5cc9d00be38cfeec90174229565211be (patch) | |
| tree | add73dbff7db10606233d1a6176c793c2cd9f858 /fs | |
| parent | Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff) | |
| download | linux-ee4987ab5cc9d00be38cfeec90174229565211be.tar.xz linux-ee4987ab5cc9d00be38cfeec90174229565211be.zip | |
[CIFS] Fix define for new proxy cap to match documentation
The transport encryption capability and new SetFSInfo level were missing, and the
new proxy capability (which Samba server is implementing) and proxy setfsinfo needed
to be moved down to not collide with Samba's transport encryption capability.
CC: Jeremy Allison <jra@samba.org>
CC: Sam Liddicott <sam@lidicott.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifspdu.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index b18c6d43bef3..3b889bc3e8d1 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -1787,7 +1787,8 @@ typedef struct smb_com_transaction2_fnext_rsp_parms { #define SMB_QUERY_CIFS_UNIX_INFO 0x200 #define SMB_QUERY_POSIX_FS_INFO 0x201 #define SMB_QUERY_POSIX_WHO_AM_I 0x202 -#define SMB_QUERY_FS_PROXY 0x203 /* WAFS enabled. Returns structure +#define SMB_REQUEST_TRANSPORT_ENCRYPTION 0x203 +#define SMB_QUERY_FS_PROXY 0x204 /* WAFS enabled. Returns structure FILE_SYSTEM__UNIX_INFO to tell whether new NTIOCTL available (0xACE) for WAN friendly SMB @@ -2048,7 +2049,9 @@ typedef struct { #define CIFS_UNIX_LARGE_READ_CAP 0x00000040 /* support reads >128K (up to 0xFFFF00 */ #define CIFS_UNIX_LARGE_WRITE_CAP 0x00000080 -#define CIFS_UNIX_PROXY_CAP 0x00000100 /* Proxy cap: 0xACE ioctl and +#define CIFS_UNIX_TRANSPORT_ENCRYPTION_ 0x00000100 /* can do SPNEGO encrypt */ +#define CIFS_UNIX_TRANPSORT_ENCRYPTION 0x00000200 /* must do SPNEGO encrypt */ +#define CIFS_UNIX_PROXY_CAP 0x00000400 /* Proxy cap: 0xACE ioctl and QFS PROXY call */ #ifdef CONFIG_CIFS_POSIX /* Can not set pathnames cap yet until we send new posix create SMB since |