s3-includes: only include acl prototypes when needed.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2c526fae552c0c3030164f80eea362a9cd0cd95d..1e4800d327d97ac151501853e4b91ef35cf955fa 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -562,33 +562,11 @@ enum flush_reason_enum {
     /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
     NUM_FLUSH_REASONS};
 
-#include "modules/nfs4_acls.h"
-
 /***** prototypes *****/
 #ifndef NO_PROTO_H
 #include "proto.h"
 #endif
 
-#if defined(HAVE_POSIX_ACLS)
-#include "modules/vfs_posixacl.h"
-#endif
-
-#if defined(HAVE_TRU64_ACLS)
-#include "modules/vfs_tru64acl.h"
-#endif
-
-#if defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
-#include "modules/vfs_solarisacl.h"
-#endif
-
-#if defined(HAVE_HPUX_ACLS)
-#include "modules/vfs_hpuxacl.h"
-#endif
-
-#if defined(HAVE_IRIX_ACLS)
-#include "modules/vfs_irixacl.h"
-#endif
-
 /* We need this after proto.h to reference GetTimeOfDay(). */
 #include "smbprofile.h"
 

diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 9a49c5012725172351b8882ec2b2d825cecd0c68..fad717b3d595026c47f202f6a0b68a4c41ab3dcd 100644 (file)
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -22,6 +22,26 @@
 #include "includes.h"
 #include "system/passwd.h"
 
+#if defined(HAVE_POSIX_ACLS)
+#include "modules/vfs_posixacl.h"
+#endif
+
+#if defined(HAVE_TRU64_ACLS)
+#include "modules/vfs_tru64acl.h"
+#endif
+
+#if defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
+#include "modules/vfs_solarisacl.h"
+#endif
+
+#if defined(HAVE_HPUX_ACLS)
+#include "modules/vfs_hpuxacl.h"
+#endif
+
+#if defined(HAVE_IRIX_ACLS)
+#include "modules/vfs_irixacl.h"
+#endif
+
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS
 

diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index bd1eee6ba42d9e18f07ac0bf908895d4791927b8..2155945b95a20590d178f3cbc3553c4b432e436a 100644 (file)
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -49,6 +49,8 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
+#include "modules/vfs_hpuxacl.h"
+
 
 /* 
  * including standard header <sys/aclv.h> 

diff --git a/source3/modules/vfs_irixacl.c b/source3/modules/vfs_irixacl.c
index 26f13cf6f06299773a07fe4a40007c8489278e76..b14abcca47cfec53791a3c03ac0350c4ed516ebe 100644 (file)
--- a/source3/modules/vfs_irixacl.c
+++ b/source3/modules/vfs_irixacl.c
@@ -20,6 +20,8 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
+#include "modules/vfs_irixacl.h"
+
 
 /* prototypes for private functions first - for clarity */
 

diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c
index 539ced2b74b39ba893f52a3c5b34fc4679f7bc2d..e1c5b630cd1296048ae109d01bc2b97edf136335 100644 (file)
--- a/source3/modules/vfs_posixacl.c
+++ b/source3/modules/vfs_posixacl.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
-
+#include "modules/vfs_posixacl.h"
 
 /* prototypes for static functions first - for clarity */
 

diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index 71da04596efc951a670e959d6edd78d04dcdf4e1..dabec5a413e41b9e4c092e62bf6c7c74bd95aef9 100644 (file)
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
-
+#include "modules/vfs_solarisacl.h"
 
 /* typedef struct acl SOLARIS_ACE_T; */
 typedef aclent_t SOLARIS_ACE_T;

diff --git a/source3/modules/vfs_tru64acl.c b/source3/modules/vfs_tru64acl.c
index f7457af627f2c2e0f90fe43738c3cf16a491e644..39fc6e9ac371dcce399fc2c93caf6bdf21114fab 100644 (file)
--- a/source3/modules/vfs_tru64acl.c
+++ b/source3/modules/vfs_tru64acl.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
+#include "modules/vfs_tru64acl.h"
 
 /* prototypes for private functions first - for clarity */