diff options
| author | Andreas Schneider <asn@samba.org> | 2011-10-27 12:00:53 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2011-10-27 13:32:02 +0200 |
| commit | 7cb08171ce5e4ce73a37d2f57f466fda0fd3669b (patch) | |
| tree | 1362a05e300ceece942a497242aa42050999f883 /source4 | |
| parent | 32fb9017eaa96b49bcdbf5508565e76e1a518b16 (diff) | |
| download | samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.tar.gz samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.tar.bz2 samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.zip | |
Include uid_wrapper correctly.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 10 | ||||
| -rw-r--r-- | source4/ntvfs/unixuid/vfs_unixuid.c | 10 |
2 files changed, 1 insertions, 19 deletions
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 <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 - - NTSTATUS ntvfs_unixuid_init(void); struct unixuid_private { |