summaryrefslogtreecommitdiff
path: root/source3
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 /source3
parent32fb9017eaa96b49bcdbf5508565e76e1a518b16 (diff)
downloadsamba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.tar.gz
samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.tar.bz2
samba-7cb08171ce5e4ce73a37d2f57f466fda0fd3669b.zip
Include uid_wrapper correctly.
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/system.c1
-rw-r--r--source3/lib/util_sec.c2
-rw-r--r--source3/rpc_server/rpc_handles.c1
-rw-r--r--source3/rpc_server/srv_access_check.c1
-rw-r--r--source3/smbd/sec_ctx.c2
5 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 45fe77e344..85988417a6 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -25,7 +25,6 @@
#include "system/capability.h"
#include "system/passwd.h"
#include "system/filesys.h"
-#include "lib/uid_wrapper/uid_wrapper.h"
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c
index 0e2eee44af..60ea214d26 100644
--- a/source3/lib/util_sec.c
+++ b/source3/lib/util_sec.c
@@ -19,7 +19,7 @@
#ifndef AUTOCONF_TEST
#include "includes.h"
-#include "lib/uid_wrapper/uid_wrapper.h"
+#include "system/passwd.h" /* uid_wrapper */
#else
/* we are running this code in autoconf test mode to see which type of setuid
function works */
diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index 87145ca848..d547f18dc1 100644
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "system/passwd.h" /* uid_wrapper */
#include "../librpc/gen_ndr/ndr_lsa.h"
#include "../librpc/gen_ndr/ndr_samr.h"
#include "auth.h"
diff --git a/source3/rpc_server/srv_access_check.c b/source3/rpc_server/srv_access_check.c
index 4e74b0443a..f667d7b23d 100644
--- a/source3/rpc_server/srv_access_check.c
+++ b/source3/rpc_server/srv_access_check.c
@@ -28,6 +28,7 @@
*/
#include "includes.h"
+#include "system/passwd.h" /* uid_wrapper */
#include "rpc_server/srv_access_check.h"
#include "../libcli/security/security.h"
#include "passdb/machine_sid.h"
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index 446810d535..99592815e3 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -18,12 +18,12 @@
*/
#include "includes.h"
+#include "system/passwd.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
#include "libcli/security/security_token.h"
#include "auth.h"
#include "smbprofile.h"
-#include "lib/uid_wrapper/uid_wrapper.h"
extern struct current_user current_user;