svn commit: samba r6716 - in trunk/source: include smbd

[jra at samba.org]

Author: jra
Date: 2005-05-10 17:59:00 +0000 (Tue, 10 May 2005)
New Revision: 6716

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6716

Log:
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.

Modified:
   trunk/source/include/trans2.h
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/include/trans2.h
===================================================================
--- trunk/source/include/trans2.h	2005-05-10 17:58:51 UTC (rev 6715)
+++ trunk/source/include/trans2.h	2005-05-10 17:59:00 UTC (rev 6716)
@@ -448,7 +448,7 @@
 #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,8 +472,15 @@
 						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
 
 /* Returns FILE_SYSTEM_POSIX_INFO struct as follows

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2005-05-10 17:58:51 UTC (rev 6715)
+++ trunk/source/smbd/trans2.c	2005-05-10 17:59:00 UTC (rev 6716)
@@ -2405,7 +2405,6 @@
 	return -1;
 }
 
-#ifdef HAVE_SYS_QUOTAS
 /****************************************************************************
  Reply to a TRANS2_SETFSINFO (set filesystem info).
 ****************************************************************************/
@@ -2517,7 +2516,6 @@
 
 	return outsize;
 }
-#endif /* HAVE_SYS_QUOTAS */
 
 /****************************************************************************
  Utility function to set bad path error.
@@ -4997,14 +4995,13 @@
 		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, 
 					  &params, 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);