r5298: - got rid of pstring.h from includes.h. This at least makes it a bit

   less likely that anyone will use pstring for new code

 - got rid of winbind_client.h from includes.h. This one triggered a
   huge change, as winbind_client.h was including system/filesys.h and
   defining the old uint32 and uint16 types, as well as its own
   pstring and fstring.
(This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f)

11 files changed, 14 insertions, 5 deletions

diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c
index 59bab6ced2..524815382d 100644
--- a/source4/libcli/auth/gensec_ntlmssp.c
+++ b/source4/libcli/auth/gensec_ntlmssp.c
@@ -29,7 +29,7 @@ struct gensec_ntlmssp_state {
 	struct auth_context *auth_context;
 	struct auth_serversupplied_info *server_info;
 	struct ntlmssp_state *ntlmssp_state;
-	uint32 have_features;
+	uint32_t have_features;
 };
 
 
@@ -470,7 +470,7 @@ static NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_secur
 }
 
 static BOOL gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
-					uint32 feature)
+					uint32_t feature)
 {
 	struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
 	if (gensec_ntlmssp_state->have_features & feature) {
diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c
index d5ddcfbfb6..572ce66bb2 100644
--- a/source4/libcli/auth/ntlmssp.c
+++ b/source4/libcli/auth/ntlmssp.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
+#include "pstring.h"
 
 static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, 
 				       TALLOC_CTX *out_mem_ctx, 
diff --git a/source4/libcli/auth/ntlmssp_parse.c b/source4/libcli/auth/ntlmssp_parse.c
index 543f3d9b61..42546cb130 100644
--- a/source4/libcli/auth/ntlmssp_parse.c
+++ b/source4/libcli/auth/ntlmssp_parse.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "pstring.h"
 
 /*
   this is a tiny msrpc packet generator. I am only using this to
diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index 7e2890272c..00a28a1ad9 100644
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -26,6 +26,7 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
+#include "pstring.h"
 
 /*
    This implements the X/Open SMB password encryption
diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c
index a61680c9d4..3980767165 100644
--- a/source4/libcli/auth/spnego.c
+++ b/source4/libcli/auth/spnego.c
@@ -844,7 +844,7 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA
 }
 
 static BOOL gensec_spnego_have_feature(struct gensec_security *gensec_security,
-				       uint32 feature) 
+				       uint32_t feature) 
 {
 	struct spnego_state *spnego_state = gensec_security->private_data;
 	if (!spnego_state->sub_sec_security) {
diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index 655838b64f..545759c494 100644
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "system/filesys.h"
 #include "asn_1.h"
 
 /****************************************************************************
@@ -697,7 +698,7 @@ static void ldap_decode_response(TALLOC_CTX *mem_ctx,
 static BOOL ldap_decode_filter(TALLOC_CTX *mem_ctx, struct asn1_data *data,
 			       char **filter)
 {
-	uint8 filter_tag, tag_desc;
+	uint8_t filter_tag, tag_desc;
 
 	if (!asn1_peek_uint8(data, &filter_tag))
 		return False;
@@ -836,7 +837,7 @@ static void ldap_decode_attribs(TALLOC_CTX *mem_ctx, struct asn1_data *data,
 
 BOOL ldap_decode(struct asn1_data *data, struct ldap_message *msg)
 {
-	uint8 tag;
+	uint8_t tag;
 
 	asn1_start_tag(data, ASN1_SEQUENCE(0));
 	asn1_read_Integer(data, &msg->messageid);
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 73099ec1be..ddf0932fa1 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/filesys.h"
 #include "auth/auth.h"
 #include "asn_1.h"
 #include "dlinklist.h"
diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c
index 30382e0837..4eba464274 100644
--- a/source4/libcli/raw/clisession.c
+++ b/source4/libcli/raw/clisession.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "system/filesys.h"
 #include "auth/auth.h"
 
 #define SETUP_REQUEST_SESSION(cmd, wct, buflen) do { \
diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index cbf0f4614e..9f48f83ba4 100644
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -32,6 +32,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "system/network.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 
diff --git a/source4/libcli/util/doserr.c b/source4/libcli/util/doserr.c
index a584def829..b346fea644 100644
--- a/source4/libcli/util/doserr.c
+++ b/source4/libcli/util/doserr.c
@@ -21,6 +21,7 @@
 /* DOS error codes.  please read doserr.h */
 
 #include "includes.h"
+#include "pstring.h"
 
 struct werror_code_struct {
 	const char *dos_errstr;
diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
index 9317f0e37a..d727cfe2a9 100644
--- a/source4/libcli/util/nterr.c
+++ b/source4/libcli/util/nterr.c
@@ -21,6 +21,7 @@
 /* NT error codes.  please read nterr.h */
 
 #include "includes.h"
+#include "pstring.h"
 
 typedef struct
 {