Some systems do not have XATTR_ defined

(This used to be commit 2cac1d3919a96c480f34c93d8b9b07782d46ed23)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7eca8d3ddf7a98066beea9186e4671060c62a3e9..c6d0885ad9f1dd35ba896149816bacbd686af2f7 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1108,6 +1108,14 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATT
 #define VXFS_QUOTA
 #endif
 
+#ifndef XATTR_CREATE
+#define XATTR_CREATE  0x1       /* set value, fail if attr already exists */
+#endif
+
+#ifndef XATTR_REPLACE
+#define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
+#endif
+
 #if defined(HAVE_KRB5)
 
 krb5_error_code smb_krb5_parse_name(krb5_context context,

diff --git a/source3/lib/system.c b/source3/lib/system.c
index eb6dcae6fb1f0c57357a54cfe67acbfe7a901da4..fa50955ef64cedee89a0d247fd78d74736617e74 100644 (file)
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1917,11 +1917,6 @@ int sys_fremovexattr (int filedes, const char *name)
 #endif
 }
 
-#if !defined(HAVE_SETXATTR)
-#define XATTR_CREATE  0x1       /* set value, fail if attr already exists */
-#define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
-#endif
-
 int sys_setxattr (const char *path, const char *name, const void *value, size_t size, int flags)
 {
 #if defined(HAVE_SETXATTR)