summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-10-27 12:00:53 +0200
committerAndreas Schneider <asn@samba.org>2011-10-27 13:32:02 +0200
commit7cb08171ce5e4ce73a37d2f57f466fda0fd3669b (patch)
tree1362a05e300ceece942a497242aa42050999f883 /lib/util
parent32fb9017eaa96b49bcdbf5508565e76e1a518b16 (diff)
downloadsamba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.tar.gz
samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.tar.bz2
samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.zip
Include uid_wrapper correctly.
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/unix_privs.c9
-rw-r--r--lib/util/util.c10
2 files changed, 1 insertions, 18 deletions
diff --git a/lib/util/unix_privs.c b/lib/util/unix_privs.c
index 9aa9a45918..baa54fd558 100644
--- a/lib/util/unix_privs.c
+++ b/lib/util/unix_privs.c
@@ -23,15 +23,6 @@
#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
diff --git a/lib/util/util.c b/lib/util/util.c
index 133bd0dfb0..c7c37bc815 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -27,6 +27,7 @@
#include "system/filesys.h"
#include "system/locale.h"
#include "system/shmem.h"
+#include "system/passwd.h"
#undef malloc
#undef strcasecmp
@@ -34,15 +35,6 @@
#undef strdup
#undef realloc
-#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 Misc utility functions