summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-04-13 23:48:33 +0200
committerGünther Deschner <gd@samba.org>2011-04-14 00:47:57 +0200
commit321587e44a337e8c47ed3a3c22dd1243d06d8a26 (patch)
tree7c30f7244e3732ea8c73548b66fe13f1afeb4ab0
parentc4331f6fcfa68822193a7ac9697d14bf8e0cde3b (diff)
downloadsamba-321587e44a337e8c47ed3a3c22dd1243d06d8a26.tar.gz
samba-321587e44a337e8c47ed3a3c22dd1243d06d8a26.tar.bz2
samba-321587e44a337e8c47ed3a3c22dd1243d06d8a26.zip
s3-includes: only include acl prototypes when needed.
Guenther
-rw-r--r--source3/include/includes.h22
-rw-r--r--source3/lib/sysacls.c20
-rw-r--r--source3/modules/vfs_hpuxacl.c2
-rw-r--r--source3/modules/vfs_irixacl.c2
-rw-r--r--source3/modules/vfs_posixacl.c2
-rw-r--r--source3/modules/vfs_solarisacl.c2
-rw-r--r--source3/modules/vfs_tru64acl.c1
7 files changed, 27 insertions, 24 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2c526fae55..1e4800d327 100644
--- 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 9a49c50127..fad717b3d5 100644
--- 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 bd1eee6ba4..2155945b95 100644
--- 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 26f13cf6f0..b14abcca47 100644
--- 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 539ced2b74..e1c5b630cd 100644
--- 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 71da04596e..dabec5a413 100644
--- 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 f7457af627..39fc6e9ac3 100644
--- 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 */