From: Jeremy Allison <jra@samba.org>
Date: Wed, 7 Jan 2009 22:57:20 +0000 (-0800)
Subject: Fix bug #6016 - Alternate Data Streams / Extended Attributes seem to conflict.
X-Git-Tag: samba-4.0.0alpha6~225
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b44fb1c931e8e295794aa33394aa3ddd930f1fa;p=thirdparty%2Fsamba.git

Fix bug #6016 - Alternate Data Streams / Extended Attributes seem to conflict.
Jeremy.
---

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index de074823696..ade5e66e86f 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -203,13 +203,16 @@ static bool get_ea_dos_attribute(connection_struct *conn, const char *path,SMB_S
 
 	sizeret = SMB_VFS_GETXATTR(conn, path, SAMBA_XATTR_DOS_ATTRIB, attrstr, sizeof(attrstr));
 	if (sizeret == -1) {
-#if defined(ENOTSUP) && defined(ENOATTR)
-		if ((errno != ENOTSUP) && (errno != ENOATTR) && (errno != EACCES) && (errno != EPERM)) {
+		if (errno == ENOSYS
+#if defined(ENOTSUP)
+			|| errno == ENOTSUP) {
+#else
+				) {
+#endif
 			DEBUG(1,("get_ea_dos_attributes: Cannot get attribute from EA on file %s: Error = %s\n",
 				path, strerror(errno) ));
 			set_store_dos_attributes(SNUM(conn), False);
 		}
-#endif
 		return False;
 	}
 	/* Null terminate string. */
@@ -263,6 +266,8 @@ static bool set_ea_dos_attribute(connection_struct *conn, const char *path, SMB_
 #else
 				) {
 #endif
+				DEBUG(1,("set_ea_dos_attributes: Cannot set attribute EA on file %s: Error = %s\n",
+					path, strerror(errno) ));
 				set_store_dos_attributes(SNUM(conn), False);
 			}
 			return False;