From 16aa0744c6820c5400b73fd4889608c38fc55b39 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sat, 30 Jan 2010 14:25:51 +0100 Subject: 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". --- lib/util/unix_privs.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'lib/util/unix_privs.c') diff --git a/lib/util/unix_privs.c b/lib/util/unix_privs.c index f55e739a9b..b30b2f5163 100644 --- a/lib/util/unix_privs.c +++ b/lib/util/unix_privs.c @@ -20,9 +20,18 @@ */ #include "includes.h" -#include "system/filesys.h" +#include "system/passwd.h" #include "../lib/util/unix_privs.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 + /** * @file * @brief Gaining/losing root privileges -- cgit