diff options
| author | Jeremy Allison <jra@samba.org> | 2007-12-27 10:18:22 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-27 10:18:22 -0800 |
| commit | 5413ad4aca69245c575b621db33b61eae5db4a35 (patch) | |
| tree | 8c67d41deb9287e6af7a784a1ea3fbb570587882 | |
| parent | 3a52874815b2b58f361ef4eb104f0bebd0cdb6ae (diff) | |
| download | samba-5413ad4aca69245c575b621db33b61eae5db4a35.tar.gz samba-5413ad4aca69245c575b621db33b61eae5db4a35.tar.bz2 samba-5413ad4aca69245c575b621db33b61eae5db4a35.zip | |
Add CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP capability to
our reported caps.
Jeremy.
(This used to be commit e86d027823c85173c64e7b85406e98f6f7345b10)
| -rw-r--r-- | source3/include/trans2.h | 3 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source3/include/trans2.h b/source3/include/trans2.h index 8ed075d418..3759d59681 100644 --- a/source3/include/trans2.h +++ b/source3/include/trans2.h @@ -530,7 +530,8 @@ findfirst/findnext is SMB_FIND_FILE_UNIX_INFO2. #define CIFS_UNIX_POSIX_PATH_OPERATIONS_CAP 0x20 /* We can cope with POSIX open/mkdir/unlink etc. */ #define CIFS_UNIX_LARGE_READ_CAP 0x40 /* We can cope with 24 bit reads in readX. */ #define CIFS_UNIX_LARGE_WRITE_CAP 0x80 /* We can cope with 24 bit writes in writeX. */ - +#define CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP 0x100 /* We can do SPNEGO negotiations for encryption. */ +#define CIFS_UNIX_TRANSPORT_ENCRYPTION_MANDATORY_CAP 0x200 /* We *must* SPNEGO negotiations for encryption. */ #define SMB_QUERY_POSIX_FS_INFO 0x201 diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 0e34284443..5a8fe41d27 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2737,7 +2737,10 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned data_len = 12; SSVAL(pdata,0,CIFS_UNIX_MAJOR_VERSION); SSVAL(pdata,2,CIFS_UNIX_MINOR_VERSION); - /* We have POSIX ACLs, pathname and locking capability. */ + + /* We have POSIX ACLs, pathname, encryption, + * large read/write, and locking capability. */ + SBIG_UINT(pdata,4,((SMB_BIG_UINT)( CIFS_UNIX_POSIX_ACLS_CAP| CIFS_UNIX_POSIX_PATHNAMES_CAP| @@ -2745,6 +2748,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned CIFS_UNIX_EXTATTR_CAP| CIFS_UNIX_POSIX_PATH_OPERATIONS_CAP| CIFS_UNIX_LARGE_READ_CAP| + CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP| (large_write ? CIFS_UNIX_LARGE_WRITE_CAP : 0)))); break; |