summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-09-09 21:48:23 +0000
committerJeremy Allison <jra@samba.org>2002-09-09 21:48:23 +0000
commit8de41d59482e7d66824c4a69563875d768f1f100 (patch)
treee92dfc3c4f678021a831049a629f97334ccce240
parenteaa4ee9bc07b0a2d412c7a73103f404b10d81dda (diff)
downloadsamba-8de41d59482e7d66824c4a69563875d768f1f100.tar.gz
samba-8de41d59482e7d66824c4a69563875d768f1f100.tar.bz2
samba-8de41d59482e7d66824c4a69563875d768f1f100.zip
Merged Steve French's fix for OS/2 EA return error being removed.
Jeremy. (This used to be commit af2168c0344d49041b1fe78cd5219ac50308deb3)
-rw-r--r--source3/include/trans2.h21
-rw-r--r--source3/smbd/trans2.c4
2 files changed, 15 insertions, 10 deletions
diff --git a/source3/include/trans2.h b/source3/include/trans2.h
index fb265fdb1a..3468d3b995 100644
--- a/source3/include/trans2.h
+++ b/source3/include/trans2.h
@@ -193,16 +193,19 @@ Byte offset Type name description
} FSINFO;
*************************************************************/
-#define SMB_INFO_STANDARD 1
-#define SMB_INFO_QUERY_EA_SIZE 2
-#define SMB_INFO_QUERY_EAS_FROM_LIST 3
-#define SMB_INFO_QUERY_ALL_EAS 4
+#define SMB_INFO_STANDARD 1 /* FILESTATUS3 struct */
+#define SMB_INFO_SET_EA 2 /* EAOP2 struct, only valid on set not query */
+#define SMB_INFO_QUERY_EA_SIZE 2 /* FILESTATUS4 struct, only valid on query not set */
+#define SMB_INFO_QUERY_EAS_FROM_LIST 3 /* only valid on query not set */
+#define SMB_INFO_QUERY_ALL_EAS 4 /* only valid on query not set */
#define SMB_INFO_IS_NAME_VALID 6
-#define SMB_QUERY_FS_LABEL_INFO 0x101
-#define SMB_QUERY_FS_VOLUME_INFO 0x102
-#define SMB_QUERY_FS_SIZE_INFO 0x103
-#define SMB_QUERY_FS_DEVICE_INFO 0x104
-#define SMB_QUERY_FS_ATTRIBUTE_INFO 0x105
+#define SMB_INFO_STANDARD_LONG 11 /* similar to level 1, ie struct FileStatus3 */
+#define SMB_QUERY_EA_SIZE_LONG 12 /* similar to level 2, ie struct FileStatus4 */
+#define SMB_QUERY_FS_LABEL_INFO 0x101
+#define SMB_QUERY_FS_VOLUME_INFO 0x102
+#define SMB_QUERY_FS_SIZE_INFO 0x103
+#define SMB_QUERY_FS_DEVICE_INFO 0x104
+#define SMB_QUERY_FS_ATTRIBUTE_INFO 0x105
#define l2_vol_fdateCreation 0
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index d21d6d2cda..de65cda2d0 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2349,7 +2349,6 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
switch (info_level) {
case SMB_INFO_STANDARD:
- case SMB_INFO_QUERY_EA_SIZE:
{
if (total_data < l1_cbFile+4)
return(ERROR_DOS(ERRDOS,ERRinvalidparam));
@@ -2366,6 +2365,9 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
break;
}
+ case SMB_INFO_SET_EA:
+ return(ERROR_DOS(ERRDOS,ERReasnotsupported));
+
/* XXXX um, i don't think this is right.
it's also not in the cifs6.txt spec.
*/