summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-01-30 14:25:51 +0100
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-02-05 19:47:26 +0100
commit16aa0744c6820c5400b73fd4889608c38fc55b39 (patch)
treeb4d8617279cf73be2d71b9fe765c6e5009ff2ac4 /source4/ntvfs
parenta51d750652671a41a2828b80feaa9e4d81219002 (diff)
downloadsamba-16aa0744c6820c5400b73fd4889608c38fc55b39.tar.gz
samba-16aa0744c6820c5400b73fd4889608c38fc55b39.tar.bz2
samba-16aa0744c6820c5400b73fd4889608c38fc55b39.zip
s4:UID wrapper - Fix includes
The includes of the UID wrapper headers werent't really efficient according to metze's post on the technical mailing list (http://lists.samba.org/archive/samba-technical/2010-February/069165.html). To achieve this move the "uid_wrapper.h" includes into "lib/util/unix_privs.c", "lib/util/util.c", "ntvfs/posix/pvfs_acl.c" and "ntvfs/unixuid/vfs_unixuid.c".
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/posix/pvfs_acl.c8
-rw-r--r--source4/ntvfs/unixuid/vfs_unixuid.c10
2 files changed, 18 insertions, 0 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index c20358be2a..c100abe5e7 100644
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -26,6 +26,14 @@
#include "libcli/security/security.h"
#include "param/param.h"
+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif
/* the list of currently registered ACL backends */
static struct pvfs_acl_backend {
diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index 8102c99536..85c70d7dd1 100644
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -29,6 +29,16 @@
#define TEVENT_DEPRECATED
#include <tevent.h>
+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif
+
+
struct unixuid_private {
struct wbc_context *wbc_ctx;
struct unix_sec_ctx *last_sec_ctx;