svn commit: samba r3543 - in branches/SAMBA_4_0/source: lib/registry/tools param utils

[tridge at samba.org]

Author: tridge
Date: 2004-11-05 07:23:06 +0000 (Fri, 05 Nov 2004)
New Revision: 3543

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3543

Log:
fixed some #include lines to make them more consistent, and fixed
conditional compilation of xattr client code

Modified:
   branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/utils/getntacl.c
   branches/SAMBA_4_0/source/utils/setntacl.c
   branches/SAMBA_4_0/source/utils/setnttoken.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c	2004-11-05 06:56:39 UTC (rev 3542)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c	2004-11-05 07:23:06 UTC (rev 3543)
@@ -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;

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2004-11-05 06:56:39 UTC (rev 3542)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2004-11-05 07:23:06 UTC (rev 3543)
@@ -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;

Modified: branches/SAMBA_4_0/source/utils/getntacl.c
===================================================================
--- branches/SAMBA_4_0/source/utils/getntacl.c	2004-11-05 06:56:39 UTC (rev 3542)
+++ branches/SAMBA_4_0/source/utils/getntacl.c	2004-11-05 07:23:06 UTC (rev 3543)
@@ -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)
 {

Modified: branches/SAMBA_4_0/source/utils/setntacl.c
===================================================================
--- branches/SAMBA_4_0/source/utils/setntacl.c	2004-11-05 06:56:39 UTC (rev 3542)
+++ branches/SAMBA_4_0/source/utils/setntacl.c	2004-11-05 07:23:06 UTC (rev 3543)
@@ -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)
 {

Modified: branches/SAMBA_4_0/source/utils/setnttoken.c
===================================================================
--- branches/SAMBA_4_0/source/utils/setnttoken.c	2004-11-05 06:56:39 UTC (rev 3542)
+++ branches/SAMBA_4_0/source/utils/setnttoken.c	2004-11-05 07:23:06 UTC (rev 3543)
@@ -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)
 {