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, 27 insertions, 27 deletions

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 089f58dc99..277a5fc793 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -1141,7 +1141,7 @@ static BOOL test_LookupPrivDisplayName(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	/* produce a reasonable range of language output without screwing up
 	   terminals */
-	uint16 language_id = (random() % 4) + 0x409;
+	uint16_t language_id = (random() % 4) + 0x409;
 
 	printf("testing LookupPrivDisplayName(%s)\n", priv_name->string);
 	
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index e3c2be038a..7c516da118 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -199,7 +199,7 @@ BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct netr_ServerAuthenticate3 a;
 	struct netr_Credential credentials1, credentials2, credentials3;
 	struct samr_Password mach_password;
-	uint32 rid;
+	uint32_t rid;
 
 	printf("Testing ServerReqChallenge\n");
 
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index b565d5de76..6164825af7 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -33,7 +33,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
 	struct RemoteActivation r;
 	NTSTATUS status;
 	struct GUID iids[2];
-	uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
+	uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
 
 	ZERO_STRUCT(r.in);
 	r.in.this.version.MajorVersion = 5;
@@ -147,7 +147,7 @@ static int test_ResolveOxid(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_t
 {
 	struct ResolveOxid r;
 	NTSTATUS status;
-	uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };	
+	uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };	
 
 	r.in.pOxid = oxid;
 	r.in.cRequestedProtseqs = 2;
@@ -171,7 +171,7 @@ static int test_ResolveOxid2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_
 {
 	struct ResolveOxid2 r;
 	NTSTATUS status;
-	uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };	
+	uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };	
 
 	r.in.pOxid = oxid;
 	r.in.cRequestedProtseqs = 2;
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index aaef981fdb..269c92a5b4 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -32,7 +32,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	struct RemoteActivation r;
 	NTSTATUS status;
 	struct GUID iids[2];
-	uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
+	uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
 
 	ZERO_STRUCT(r.in);
 	r.in.this.version.MajorVersion = 5;
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 1c7e3e0350..06988459fd 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -73,7 +73,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
 	struct netr_LogonSamLogonWithFlags *r_flags = &samlogon_state->r_flags;
 	struct netr_NetworkInfo ninfo;
 	struct netr_SamBaseInfo *base = NULL;
-	uint16 validation_level = 0;
+	uint16_t validation_level = 0;
 	
 	samlogon_state->r.in.logon.network = &ninfo;
 	samlogon_state->r_ex.in.logon.network = &ninfo;
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index fa64b556ef..31380c109a 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -433,7 +433,7 @@ static BOOL test_SetUserPass(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 
 static BOOL test_SetUserPass_23(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-				struct policy_handle *handle, uint32 fields_present,
+				struct policy_handle *handle, uint32_t fields_present,
 				char **password)
 {
 	NTSTATUS status;
@@ -547,7 +547,7 @@ static BOOL test_SetUserPassEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_SetUserPass_25(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-				struct policy_handle *handle, uint32 fields_present,
+				struct policy_handle *handle, uint32_t fields_present,
 				char **password)
 {
 	NTSTATUS status;
@@ -1546,7 +1546,7 @@ static BOOL test_CreateUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	char *password = NULL;
 
 	int i;
-	const uint32 password_fields[] = {
+	const uint32_t password_fields[] = {
 		SAMR_FIELD_PASSWORD,
 		SAMR_FIELD_PASSWORD2,
 		SAMR_FIELD_PASSWORD | SAMR_FIELD_PASSWORD2,
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index f7800e28cc..3fc916450f 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -389,7 +389,7 @@ static BOOL samsync_handle_policy(TALLOC_CTX *mem_ctx, struct samsync_state *sam
 static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
 				int database_id, struct netr_DELTA_ENUM *delta) 
 {
-	uint32 rid = delta->delta_id_union.rid;
+	uint32_t rid = delta->delta_id_union.rid;
 	struct netr_DELTA_USER *user = delta->delta_union.user;
 	struct netr_SamInfo3 *info3;
 	struct samr_Password lm_hash;
@@ -604,7 +604,7 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
 static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
 				 int database_id, struct netr_DELTA_ENUM *delta) 
 {
-	uint32 rid = delta->delta_id_union.rid;
+	uint32_t rid = delta->delta_id_union.rid;
 	struct netr_DELTA_ALIAS *alias = delta->delta_union.alias;
 	NTSTATUS nt_status;
 	BOOL ret = True;
@@ -653,7 +653,7 @@ static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *sams
 static BOOL samsync_handle_group(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
 				 int database_id, struct netr_DELTA_ENUM *delta) 
 {
-	uint32 rid = delta->delta_id_union.rid;
+	uint32_t rid = delta->delta_id_union.rid;
 	struct netr_DELTA_GROUP *group = delta->delta_union.group;
 	NTSTATUS nt_status;
 	BOOL ret = True;
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index bf225a1602..26f186e912 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -114,8 +114,8 @@ static BOOL test_netlogon_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
   test a schannel connection with the given flags
  */
 static BOOL test_schannel(TALLOC_CTX *mem_ctx, 
-			  uint16 acct_flags, uint32 dcerpc_flags,
-			  uint32 schannel_type)
+			  uint16_t acct_flags, uint32_t dcerpc_flags,
+			  uint32_t schannel_type)
 {
 	void *join_ctx;
 	const char *machine_password;
@@ -215,9 +215,9 @@ BOOL torture_rpc_schannel(void)
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
 	struct {
-		uint16 acct_flags;
-		uint32 dcerpc_flags;
-		uint32 schannel_type;
+		uint16_t acct_flags;
+		uint32_t dcerpc_flags;
+		uint32_t schannel_type;
 	} tests[] = {
 		{ ACB_WSTRUST,   DCERPC_SCHANNEL_WORKSTATION | DCERPC_SIGN,                       3 },
 		{ ACB_WSTRUST,   DCERPC_SCHANNEL_WORKSTATION | DCERPC_SEAL,                       3 },
diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index 4b1305b7b6..697ae4afe7 100644
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -105,7 +105,7 @@ static BOOL test_NetCharDevEnum(struct dcerpc_pipe *p,
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
-	r.in.max_buffer = (uint32)-1;
+	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = NULL;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -252,7 +252,7 @@ static BOOL test_NetCharDevQEnum(struct dcerpc_pipe *p,
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
-	r.in.max_buffer = (uint32)-1;
+	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = NULL;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c
index cadc80a417..092329ab68 100644
--- a/source4/torture/rpc/svcctl.c
+++ b/source4/torture/rpc/svcctl.c
@@ -28,7 +28,7 @@ static BOOL test_EnumServicesStatus(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct svcctl_EnumServicesStatusW r;
 	int i;
 	NTSTATUS status;
-	uint32 resume_handle = 0;
+	uint32_t resume_handle = 0;
 	struct ENUM_SERVICE_STATUS *service = NULL; 
 
 	r.in.handle = h;
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index f2d79fffa0..9d259ae47a 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -365,9 +365,9 @@ static BOOL test_QueryMultipleValues(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.values[0].type = 0;
 
 	r.in.num_values = 1;
-	r.in.buffer_size = r.out.buffer_size = talloc(mem_ctx, uint32);
+	r.in.buffer_size = r.out.buffer_size = talloc(mem_ctx, uint32_t);
 	*r.in.buffer_size = 0x20;
-	r.in.buffer = r.out.buffer = talloc_zero_array(mem_ctx, uint8, *r.in.buffer_size);
+	r.in.buffer = r.out.buffer = talloc_zero_array(mem_ctx, uint8_t, *r.in.buffer_size);
 
 	status = dcerpc_winreg_QueryMultipleValues(p, mem_ctx, &r);
 	if(NT_STATUS_IS_ERR(status)) {
@@ -387,8 +387,8 @@ static BOOL test_QueryValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct p
 {
 	struct winreg_QueryValue r;
 	NTSTATUS status;
-	uint32 zero = 0;
-	uint32 offered = 0xfff;
+	uint32_t zero = 0;
+	uint32_t offered = 0xfff;
 
 	printf("Testing QueryValue\n");
 
@@ -417,8 +417,8 @@ static BOOL test_EnumValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			   struct policy_handle *handle, int max_valnamelen, int max_valbufsize)
 {
 	struct winreg_EnumValue r;
-	uint32 type = 0;
-	uint32 size = max_valbufsize, zero = 0;
+	uint32_t type = 0;
+	uint32_t size = max_valbufsize, zero = 0;
 	BOOL ret = True;
 	uint8_t buf8;
 	uint16_t buf16;