[SCM] Samba Shared Repository - branch master updated - 9b44fb1c931e8e295794aa33394aa3ddd930f1fa

[Jeremy Allison]

The branch, master has been updated
       via  9b44fb1c931e8e295794aa33394aa3ddd930f1fa (commit)
      from  c81de641cd9a114ca47242fa1fd56eef19e86505 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9b44fb1c931e8e295794aa33394aa3ddd930f1fa
Author: Jeremy Allison <j...@samba.org>
Date:   Wed Jan 7 14:57:20 2009 -0800

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

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index de07482..ade5e66 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;


-- 
Samba Shared Repository