From 7b5fb7d9e88bf848173363f5a1e2a0f1db6c7293 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Sat, 8 Oct 2011 12:10:20 +0200
Subject: replace: Add don't include unistd.h directly and add uid_wrapper.

---
 source4/lib/policy/gp_filesys.c | 4 +---
 source4/libcli/smb2/session.c   | 3 +--
 source4/torture/rpc/samr.c      | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'source4')

diff --git a/source4/lib/policy/gp_filesys.c b/source4/lib/policy/gp_filesys.c
index 55180cb78e..17894a7072 100644
--- a/source4/lib/policy/gp_filesys.c
+++ b/source4/lib/policy/gp_filesys.c
@@ -17,15 +17,13 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/policy/policy.h"
 #include "libcli/raw/smb.h"
 #include "libcli/libcli.h"
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
 #include "libcli/raw/libcliraw.h"
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 
diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c
index f30152329e..74b8668462 100644
--- a/source4/libcli/smb2/session.c
+++ b/source4/libcli/smb2/session.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/network.h"
 #include <tevent.h>
 #include "lib/util/tevent_ntstatus.h"
 #include "libcli/raw/libcliraw.h"
@@ -27,8 +28,6 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "auth/gensec/gensec.h"
 
-#include <unistd.h>
-
 /**
   initialise a smb2_session structure
  */
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index f7d6a93bb3..cc2cdfc352 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include <tevent.h>
 #include "system/time.h"
+#include "system/network.h"
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
@@ -39,8 +40,6 @@
 #include "auth/gensec/gensec_proto.h"
 #include "../libcli/auth/schannel.h"
 
-#include <unistd.h>
-
 #define TEST_ACCOUNT_NAME "samrtorturetest"
 #define TEST_ACCOUNT_NAME_PWD "samrpwdlastset"
 #define TEST_ALIASNAME "samrtorturetestalias"
-- 
cgit