From 9b44fb1c931e8e295794aa33394aa3ddd930f1fa Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 7 Jan 2009 14:57:20 -0800 Subject: Fix bug #6016 - Alternate Data Streams / Extended Attributes seem to conflict. Jeremy. --- source3/smbd/dosmode.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'source3/smbd') 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; -- cgit