From 7cb08171ce5e4ce73a37d2f57f466fda0fd3669b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 27 Oct 2011 12:00:53 +0200 Subject: Include uid_wrapper correctly. --- source4/ntvfs/posix/pvfs_acl.c | 10 +--------- source4/ntvfs/unixuid/vfs_unixuid.c | 10 ---------- 2 files changed, 1 insertion(+), 19 deletions(-) (limited to 'source4') diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 8157d862ec..b253b8ab2d 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "system/passwd.h" #include "auth/auth.h" #include "vfs_posix.h" #include "librpc/gen_ndr/xattr.h" @@ -28,15 +29,6 @@ #include "../lib/util/unix_privs.h" #include "lib/util/samba_modules.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 { const struct pvfs_acl_ops *ops; diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c index 0221b4391c..7e7fd443d5 100644 --- a/source4/ntvfs/unixuid/vfs_unixuid.c +++ b/source4/ntvfs/unixuid/vfs_unixuid.c @@ -29,16 +29,6 @@ #define TEVENT_DEPRECATED #include -#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 - - NTSTATUS ntvfs_unixuid_init(void); struct unixuid_private { -- cgit