r25027: Fix more warnings.

(This used to be commit 5085c53fcfade614e83d21fc2c1a5bc43bb2a729)

10 files changed, 16 insertions, 6 deletions

diff --git a/source4/libcli/clilist.c b/source4/libcli/clilist.c
index ba85ec397a..14fd3ee4f7 100644
--- a/source4/libcli/clilist.c
+++ b/source4/libcli/clilist.c
@@ -118,7 +118,8 @@ int smbcli_list_new(struct smbcli_tree *tree, const char *Mask, uint16_t attribu
 	state.dirlist_len = 0;
 	state.total_received = 0;
 	
-	state.dirlist = talloc_new(state.mem_ctx);
+	state.dirlist = talloc_array(state.mem_ctx, 
+				     struct clilist_file_info, 0);
 	mask = talloc_strdup(state.mem_ctx, Mask);
 
 	if (level == RAW_SEARCH_DATA_GENERIC) {
@@ -275,7 +276,8 @@ int smbcli_list_old(struct smbcli_tree *tree, const char *Mask, uint16_t attribu
 	state.total_received = 0;
 	state.data_level = RAW_SEARCH_DATA_SEARCH;
 
-	state.dirlist = talloc_new(state.mem_ctx);
+	state.dirlist = talloc_array(state.mem_ctx, struct clilist_file_info,
+				     0);
 	mask = talloc_strdup(state.mem_ctx, Mask);
   
 	while (1) {
diff --git a/source4/libcli/climessage.c b/source4/libcli/climessage.c
index 3d4d9da96c..35607ba45b 100644
--- a/source4/libcli/climessage.c
+++ b/source4/libcli/climessage.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 
 /****************************************************************************
diff --git a/source4/libcli/clireadwrite.c b/source4/libcli/clireadwrite.c
index e6e66ef36e..89ae157042 100644
--- a/source4/libcli/clireadwrite.c
+++ b/source4/libcli/clireadwrite.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 /****************************************************************************
   Read size bytes at offset offset using SMBreadX.
diff --git a/source4/libcli/clitrans2.c b/source4/libcli/clitrans2.c
index 03deea2e82..5c5ba6585f 100644
--- a/source4/libcli/clitrans2.c
+++ b/source4/libcli/clitrans2.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 /****************************************************************************
 send a qpathinfo call
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 46cca36009..edd9a92693 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -27,6 +27,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/libcli.h"
 #include "libcli/resolve/resolve.h"
+#include "libcli/finddcs.h"
 #include "param/param.h"
 
 struct finddcs_state {
diff --git a/source4/libcli/security/dom_sid.c b/source4/libcli/security/dom_sid.c
index 8d6bb79714..1ba3edd9bf 100644
--- a/source4/libcli/security/dom_sid.c
+++ b/source4/libcli/security/dom_sid.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/security.h"
+#include "libcli/security/security.h"
 
 /*****************************************************************
  Compare the auth portion of two sids.
@@ -78,7 +79,7 @@ static int dom_sid_compare(const struct dom_sid *sid1, const struct dom_sid *sid
  Compare two sids.
 *****************************************************************/  
 
-BOOL dom_sid_equal(const struct dom_sid *sid1, const struct dom_sid *sid2)
+bool dom_sid_equal(const struct dom_sid *sid1, const struct dom_sid *sid2)
 {
 	return dom_sid_compare(sid1, sid2) == 0;
 }
diff --git a/source4/libcli/security/privilege.c b/source4/libcli/security/privilege.c
index 635f470bf6..103e2e3c14 100644
--- a/source4/libcli/security/privilege.c
+++ b/source4/libcli/security/privilege.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/security.h" 
+#include "libcli/security/security.h" 
 
 
 static const struct {
diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c
index 06c3c2eca7..1e33e1950b 100644
--- a/source4/libcli/security/security_descriptor.c
+++ b/source4/libcli/security/security_descriptor.c
@@ -60,7 +60,7 @@ static struct security_acl *security_acl_dup(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
-	nacl->aces = talloc_memdup (nacl, oacl->aces, sizeof(struct security_ace) * oacl->num_aces);
+	nacl->aces = (struct security_ace *)talloc_memdup (nacl, oacl->aces, sizeof(struct security_ace) * oacl->num_aces);
 	if ((nacl->aces == NULL) && (oacl->num_aces > 0)) {
 		goto failed;
 	}
@@ -69,7 +69,7 @@ static struct security_acl *security_acl_dup(TALLOC_CTX *mem_ctx,
 
 	for (i = 0; i < oacl->num_aces; i++) {
 		nacl->aces[i].trustee.sub_auths = 
-			talloc_memdup(nacl->aces, nacl->aces[i].trustee.sub_auths,
+			(uint32_t *)talloc_memdup(nacl->aces, nacl->aces[i].trustee.sub_auths,
 				      sizeof(uint32_t) * nacl->aces[i].trustee.num_auths);
 
 		if ((nacl->aces[i].trustee.sub_auths == NULL) && (nacl->aces[i].trustee.num_auths > 0)) {
@@ -163,7 +163,7 @@ NTSTATUS security_descriptor_dacl_add(struct security_descriptor *sd,
 
 	sd->dacl->aces[sd->dacl->num_aces] = *ace;
 	sd->dacl->aces[sd->dacl->num_aces].trustee.sub_auths = 
-		talloc_memdup(sd->dacl->aces, 
+		(uint32_t *)talloc_memdup(sd->dacl->aces, 
 			      sd->dacl->aces[sd->dacl->num_aces].trustee.sub_auths,
 			      sizeof(uint32_t) * 
 			      sd->dacl->aces[sd->dacl->num_aces].trustee.num_auths);
diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 545f3c8353..cca4f861de 100644
--- a/source4/libcli/smb2/request.c
+++ b/source4/libcli/smb2/request.c
@@ -25,6 +25,7 @@
 #include "libcli/smb2/smb2.h"
 #include "lib/util/dlinklist.h"
 #include "lib/events/events.h"
+#include "libcli/smb2/smb2_calls.h"
 
 /*
   initialise a smb2 request
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 6fd84bbe74..0fdf8a8e3a 100644
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -31,6 +31,7 @@
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "libcli/util/clilsa.h"
 
 struct smblsa_state {
 	struct dcerpc_pipe *pipe;