summaryrefslogtreecommitdiff
path: root/lib/uid_wrapper
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/uid_wrapper
parent32fb9017eaa96b49bcdbf5508565e76e1a518b16 (diff)
downloadsamba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.tar.gz
samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.tar.bz2
samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.zip
Include uid_wrapper correctly.
Diffstat (limited to 'lib/uid_wrapper')
-rw-r--r--lib/uid_wrapper/uid_wrapper.c4
-rw-r--r--lib/uid_wrapper/uid_wrapper.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/uid_wrapper/uid_wrapper.c b/lib/uid_wrapper/uid_wrapper.c
index c43dbc1436..898d1afbb9 100644
--- a/lib/uid_wrapper/uid_wrapper.c
+++ b/lib/uid_wrapper/uid_wrapper.c
@@ -19,9 +19,9 @@
#ifdef _SAMBA_BUILD_
#define UID_WRAPPER_NOT_REPLACE
-#include "../replace/replace.h"
-#include <talloc.h>
+#include "replace.h"
#include "system/passwd.h"
+#include <talloc.h>
#else /* _SAMBA_BUILD_ */
diff --git a/lib/uid_wrapper/uid_wrapper.h b/lib/uid_wrapper/uid_wrapper.h
index 7cb97af8df..680e544583 100644
--- a/lib/uid_wrapper/uid_wrapper.h
+++ b/lib/uid_wrapper/uid_wrapper.h
@@ -33,6 +33,8 @@ int uwrap_getgroups(int size, gid_t *list);
uid_t uwrap_getuid(void);
gid_t uwrap_getgid(void);
+#ifdef UID_WRAPPER_REPLACE
+
#ifdef seteuid
#undef seteuid
#endif
@@ -93,5 +95,6 @@ gid_t uwrap_getgid(void);
#endif
#define getgid uwrap_getgid
-#endif
+#endif /* UID_WRAPPER_REPLACE */
+#endif /* uwrap_enabled */
#endif /* __UID_WRAPPER_H__ */