debug instead of error loglevel

[netatalk.git] / libatalk / vfs / extattr.c

diff --git a/libatalk/vfs/extattr.c b/libatalk/vfs/extattr.c
index 853b7f2ffe3c3fd7691f097599dcd3066a75014b..c98b6ea14f751e3f0293dec15f67c7d2afb89ab8 100644 (file)
--- a/libatalk/vfs/extattr.c
+++ b/libatalk/vfs/extattr.c
@@ -63,7 +63,7 @@
 
 /******** Solaris EA helper function prototypes ********/
 #ifdef HAVE_ATTROPEN
-#define SOLARIS_ATTRMODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP
+#define SOLARIS_ATTRMODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH
 static int solaris_write_xattr(int attrfd, const char *value, size_t size);
 static ssize_t solaris_read_xattr(int attrfd, void *value, size_t size);
 static ssize_t solaris_list_xattr(int attrdirfd, char *list, size_t size);
@@ -88,6 +88,31 @@ static const char *prefix(const char *uname)
 #endif
 }
 
+int sys_getxattrfd(int fd, const char *uname, int oflag, ...)
+{
+#if defined HAVE_ATTROPEN
+    int eafd;
+    va_list args;
+    mode_t mode = 0;
+
+    if (oflag & O_CREAT) {
+        va_start(args, oflag);
+        mode = va_arg(args, mode_t);
+        va_end(args);
+    }
+
+    if (oflag & O_CREAT)
+        eafd = solaris_openat(fd, uname, oflag | O_XATTR, mode);
+    else
+        eafd = solaris_openat(fd, uname, oflag | O_XATTR, mode);
+
+    return eafd;
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
 ssize_t sys_getxattr (const char *path, const char *uname, void *value, size_t size)
 {
        const char *name = prefix(uname);
@@ -841,24 +866,38 @@ static int solaris_unlinkat(int attrdirfd, const char *name)
 
 static int solaris_attropen(const char *path, const char *attrpath, int oflag, mode_t mode)
 {
-       int filedes = attropen(path, attrpath, oflag, mode);
-       if (filedes == -1) {
-        if (errno != ENOENT)
+       int filedes;
+
+       if ((filedes = attropen(path, attrpath, oflag, mode)) == -1) {
+        switch (errno) {
+        case ENOENT:
+        case EEXIST:
+            break;
+        default:
             LOG(log_error, logtype_default, "attropen(\"%s\", ea:'%s'): %s",
                 path, attrpath, strerror(errno));
-        errno = ENOATTR;
+            errno = ENOATTR;
+            break;
+        }
        }
        return filedes;
 }
 
 static int solaris_openat(int fildes, const char *path, int oflag, mode_t mode)
 {
-       int filedes = openat(fildes, path, oflag, mode);
-       if (filedes == -1) {
-        if (errno != ENOENT)
+       int filedes;
+
+       if ((filedes = openat(fildes, path, oflag, mode)) == -1) {
+        switch (errno) {
+        case ENOENT:
+        case EEXIST:
+            break;
+        default:
             LOG(log_error, logtype_default, "openat(\"%s\"): %s",
                 path, strerror(errno));
-        errno = ENOATTR;
+            errno = ENOATTR;
+            break;
+        }
        }
        return filedes;
 }