r3543: fixed some #include lines to make them more consistent, and fixed

conditional compilation of xattr client code
(This used to be commit 321fb06a627f4deae649ab014bc881721d37b3dd)

diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 38eabb60a9ebad07a4a16895b0037078c24bfb0c..4ad7e162a3bccb0cf62212a9fd616829b0274f58 100644 (file)
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -59,7 +59,7 @@
 #define CMD_KEY 1
 #define CMD_VAL 2
 
-#include <include/includes.h>
+#include "includes.h"
 
 typedef struct val_spec_list {
   struct val_spec_list *next;

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index c535509ca6080afc2a583f5183b5d5d6dd80e881..bbdf835e95358635d97709d739a304401e6342f1 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -59,7 +59,7 @@
 #include "system/network.h"
 #include "system/printing.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
-#include "include/dlinklist.h"
+#include "dlinklist.h"
 
 BOOL in_client = False;                /* Not in the client by default */
 static BOOL bLoaded = False;

diff --git a/source4/utils/getntacl.c b/source4/utils/getntacl.c
index 0d6e86bf3b2328b0b25d2c906731812e2080ba2c..2a35c933875682b1d47ea217af5eb92a7b50ba43 100644 (file)
--- a/source4/utils/getntacl.c
+++ b/source4/utils/getntacl.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_NO_ACLS
+#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT))
 
 int main(int argc, char **argv)
 {

diff --git a/source4/utils/setntacl.c b/source4/utils/setntacl.c
index 2ac6e6d6f3541d64d9c02f2b74ca2c7a01dbe78b..a65a014f26fab4bbc27f87efdf5de7c6df4a7870 100644 (file)
--- a/source4/utils/setntacl.c
+++ b/source4/utils/setntacl.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_NO_ACLS
+#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT))
 
 int main(int argc, char **argv)
 {

diff --git a/source4/utils/setnttoken.c b/source4/utils/setnttoken.c
index e3f699fce45f9da990fb77a3bde585e0b019660d..b3b11a78caae05a156889c989ae4a3614a262f41 100644 (file)
--- a/source4/utils/setnttoken.c
+++ b/source4/utils/setnttoken.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_NO_ACLS
+#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT))
 
 int main(int argc, char **argv)
 {