summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-01-07 14:57:20 -0800
committerJeremy Allison <jra@samba.org>2009-01-07 14:57:20 -0800
commit9b44fb1c931e8e295794aa33394aa3ddd930f1fa (patch)
treeb009fbc5772a6c5774309dac7555128aa1032929
parentc81de641cd9a114ca47242fa1fd56eef19e86505 (diff)
downloadsamba-9b44fb1c931e8e295794aa33394aa3ddd930f1fa.tar.gz
samba-9b44fb1c931e8e295794aa33394aa3ddd930f1fa.tar.bz2
samba-9b44fb1c931e8e295794aa33394aa3ddd930f1fa.zip
Fix bug #6016 - Alternate Data Streams / Extended Attributes seem to conflict.
Jeremy.
-rw-r--r--source3/smbd/dosmode.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index de07482369..ade5e66e86 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;