From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 14 Jul 2009 13:34:57 +0000 (+0100)
Subject: RHEL 5: header was called <sys/xattr.h>
X-Git-Tag: 1.0.59~1
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=72c6cc02e2c66cccf3c092a232f107cca5896fe1

RHEL 5: header was called <sys/xattr.h>
---

diff --git a/daemon/configure.ac b/daemon/configure.ac
index 2fd1ae9..dc6936b 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -66,7 +66,7 @@ dnl Functions which may not be available in older distributions.
 AC_CHECK_FUNCS([futimens listxattr llistxattr getxattr lgetxattr setxattr lsetxattr removexattr lremovexattr])
 
 dnl Headers.
-AC_CHECK_HEADERS([attr/xattr.h])
+AC_CHECK_HEADERS([attr/xattr.h sys/xattr.h])
 
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
diff --git a/daemon/xattr.c b/daemon/xattr.c
index 70c9070..23b00d8 100644
--- a/daemon/xattr.c
+++ b/daemon/xattr.c
@@ -25,8 +25,15 @@
 #include "daemon.h"
 #include "actions.h"
 
+#if defined(HAVE_ATTR_XATTR_H) || defined(HAVE_SYS_XATTR_H)
+
 #ifdef HAVE_ATTR_XATTR_H
 #include <attr/xattr.h>
+#else
+#ifdef HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#endif
+#endif
 
 static guestfs_int_xattr_list *getxattrs (char *path, ssize_t (*listxattr) (const char *path, char *list, size_t size), ssize_t (*getxattr) (const char *path, const char *name, void *value, size_t size));
 static int _setxattr (char *xattr, char *val, int vallen, char *path, int (*setxattr) (const char *path, const char *name, const void *value, size_t size, int flags));
@@ -237,7 +244,7 @@ _removexattr (char *xattr, char *path,
   return 0;
 }
 
-#else /* !HAVE_ATTR_XATTR_H */
+#else /* no xattr.h */
 
 guestfs_int_xattr_list *
 do_getxattrs (char *path)
@@ -281,4 +288,4 @@ do_lremovexattr (char *xattr, char *path)
   return -1;
 }
 
-#endif /* !HAVE_ATTR_XATTR_H */
+#endif /* no xattr.h */