summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-09-24 04:49:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:07 -0500
commit00e05a0b8ba4c6b16a53d20fa5a8eef8fbd6263a (patch)
treec5405a2b82913b5b89924d4918af1cf26f022d63 /source4/utils
parentfe45888e228d1452b8301b3b074794bd443a7fa5 (diff)
downloadsamba-00e05a0b8ba4c6b16a53d20fa5a8eef8fbd6263a.tar.gz
samba-00e05a0b8ba4c6b16a53d20fa5a8eef8fbd6263a.tar.bz2
samba-00e05a0b8ba4c6b16a53d20fa5a8eef8fbd6263a.zip
r2582: Merge checks for xattr and acl libraries from Samba3 so the {get,set}ntacl
programs can build on non-xattr machines. (This used to be commit daad76207dbb4060c231a58c99970e837e1e858f)
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/getntacl.c13
-rw-r--r--source4/utils/setntacl.c13
2 files changed, 24 insertions, 2 deletions
diff --git a/source4/utils/getntacl.c b/source4/utils/getntacl.c
index b17200aeb5..0d6e86bf3b 100644
--- a/source4/utils/getntacl.c
+++ b/source4/utils/getntacl.c
@@ -21,7 +21,16 @@
*/
#include "includes.h"
-#include <attr/xattr.h>
+
+#ifdef HAVE_NO_ACLS
+
+int main(int argc, char **argv)
+{
+ printf("ACL support not compiled in.");
+ return 1;
+}
+
+#else
/* Display a security descriptor in "psec" format which is as follows.
@@ -114,3 +123,5 @@ int main(int argc, char **argv)
print_psec(data, &sd);
return 0;
}
+
+#endif /* HAVE_NO_ACLS */
diff --git a/source4/utils/setntacl.c b/source4/utils/setntacl.c
index 492c3ba9fe..93939caec0 100644
--- a/source4/utils/setntacl.c
+++ b/source4/utils/setntacl.c
@@ -21,7 +21,16 @@
*/
#include "includes.h"
-#include <attr/xattr.h>
+
+#ifdef HAVE_NO_ACLS
+
+int main(int argc, char **argv)
+{
+ printf("ACL support not compiled in.");
+ return 1;
+}
+
+#else
static void setntacl(char *filename, struct security_descriptor *sd)
{
@@ -103,3 +112,5 @@ static void setntacl(char *filename, struct security_descriptor *sd)
return 0;
}
+
+#endif /* HAVE_NO_ACLS */