diff options
| author | Jeremy Allison <jra@samba.org> | 2005-05-10 17:58:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:53 -0500 |
| commit | 1d37a6267ed07ce1d181d76a5e4ca06bc41c3c88 (patch) | |
| tree | 2cba102f0806f98dbb30cd02386647afa3a78f3f | |
| parent | 27bef67b3a8d8ae5f800c8477473ad6258391293 (diff) | |
| download | samba-1d37a6267ed07ce1d181d76a5e4ca06bc41c3c88.tar.gz samba-1d37a6267ed07ce1d181d76a5e4ca06bc41c3c88.tar.bz2 samba-1d37a6267ed07ce1d181d76a5e4ca06bc41c3c88.zip | |
r6715: We don't need to wrap the setfsinfo call in HAVE_QUOTA
as they'll just return ENOSYS if we don't. Add new CAP for
POSIX pathnames, prepare to allow FSINFO set for client POSIX
caps.
Jeremy.
(This used to be commit 4d99b57aedba8431ef5827d1e75413a10b35e1ce)
| -rw-r--r-- | source3/include/trans2.h | 11 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/source3/include/trans2.h b/source3/include/trans2.h index 2aae1137dd..2f56c640d3 100644 --- a/source3/include/trans2.h +++ b/source3/include/trans2.h @@ -448,7 +448,7 @@ Offset Size Name #define SMB_FIND_FILE_UNIX 0x202 /* - Info level for QVOLINFO - returns version of CIFS UNIX extensions, plus + Info level for TRANS2_QFSINFO - returns version of CIFS UNIX extensions, plus 64-bits worth of capability fun :-). */ @@ -472,7 +472,14 @@ Offset Size Name security and trusted */ #define CIFS_UNIX_EXTATTR_CAP 0x8 /* for support of chattr (chflags) and lsattr */ - +#define CIFS_UNIX_POSIX_PATHNAMES_CAP 0x10 /* Use POSIX pathnames on the wire. */ + +/* + Info level for TRANSACT2_SETFSINFO - takes 64-bits of capabilies in the data section. +*/ + +#define SMB_SET_CIFS_UNIX_INFO 0x200 + #define SMB_QUERY_POSIX_FS_INFO 0x201 diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index d9f3c9e81d..8dedf30472 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2405,7 +2405,6 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned return -1; } -#ifdef HAVE_SYS_QUOTAS /**************************************************************************** Reply to a TRANS2_SETFSINFO (set filesystem info). ****************************************************************************/ @@ -2517,7 +2516,6 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb return outsize; } -#endif /* HAVE_SYS_QUOTAS */ /**************************************************************************** Utility function to set bad path error. @@ -4997,14 +4995,13 @@ int reply_trans2(connection_struct *conn, END_PROFILE_NESTED(Trans2_qfsinfo); break; -#ifdef HAVE_SYS_QUOTAS case TRANSACT2_SETFSINFO: START_PROFILE_NESTED(Trans2_setfsinfo); outsize = call_trans2setfsinfo(conn, inbuf, outbuf, length, bufsize, ¶ms, total_params, &data, total_data, max_data_bytes); END_PROFILE_NESTED(Trans2_setfsinfo); break; -#endif + case TRANSACT2_QPATHINFO: case TRANSACT2_QFILEINFO: START_PROFILE_NESTED(Trans2_qpathinfo); |