[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3337-ga2042ed

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  a2042edb42e312d5b8fc5b4750bf5b91b5ee1b3c (commit)
      from  3954c6965240836a467d16f447197681b7396a31 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit a2042edb42e312d5b8fc5b4750bf5b91b5ee1b3c
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 7 14:55:51 2009 -0800

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

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/dosmode.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c
index 88c6a51..69100bf 100644
--- a/source/smbd/dosmode.c
+++ b/source/smbd/dosmode.c
@@ -198,13 +198,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. */
@@ -258,6 +261,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;


-- 
Samba Shared Repository