fixed some warnings

(This used to be commit 1c2b8a93c50e3d5485732a2f06847166e883f939)

6 files changed, 8 insertions, 7 deletions

diff --git a/source4/client/client.c b/source4/client/client.c
index c46c8d8133..7cf3a0b125 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -1686,7 +1686,8 @@ static int cmd_allinfo(void)
 	finfo.generic.level = RAW_FILEINFO_INTERNAL_INFORMATION;
 	status = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo);
 	if (NT_STATUS_IS_OK(status)) {
-		d_printf("\tfile_id         %.0f\n", finfo.internal_information.out.file_id);
+		d_printf("\tfile_id         %.0f\n", 
+			 (double)finfo.internal_information.out.file_id);
 	}
 
 	/* the EAs, if any */
@@ -2447,7 +2448,7 @@ static char **remote_completion(const char *text, int len)
 {
 	pstring dirmask;
 	int i;
-	completion_remote_t info = { "", NULL, 1, NULL, NULL, NULL };
+	completion_remote_t info = { "", NULL, 1, 0, NULL, 0 };
 
 	info.samelen = len;
 	info.text = text;
diff --git a/source4/lib/module.c b/source4/lib/module.c
index d45f99473e..c6c4ef6979 100644
--- a/source4/lib/module.c
+++ b/source4/lib/module.c
@@ -44,7 +44,7 @@ NTSTATUS smb_load_module(const char *module_name)
 	 * want to use wildcards here? */
 	if(S_ISDIR(st.st_mode)) {
 		dir = opendir(module_name);
-		while(dirent = readdir(dir)) {
+		while ((dirent = readdir(dir))) {
 			smb_load_module(dirent->d_name);
 		}
 	}
diff --git a/source4/passdb/machine_sid.c b/source4/passdb/machine_sid.c
index f19b4a0c1d..41979c6526 100644
--- a/source4/passdb/machine_sid.c
+++ b/source4/passdb/machine_sid.c
@@ -176,7 +176,7 @@ static BOOL pdb_generate_sam_sid(void)
 }   
 
 /* return our global_sam_sid */
-DOM_SID *get_global_sam_sid(void)
+struct sid_info *get_global_sam_sid(void)
 {
 	if (global_sam_sid != NULL)
 		return global_sam_sid;
diff --git a/source4/torture/mangle_test.c b/source4/torture/mangle_test.c
index fadd884061..758cef4861 100644
--- a/source4/torture/mangle_test.c
+++ b/source4/torture/mangle_test.c
@@ -29,7 +29,7 @@ static unsigned total, collisions, failures;
 static BOOL test_one(struct cli_state *cli, const char *name)
 {
 	int fnum;
-	char *shortname;
+	const char *shortname;
 	fstring name2;
 	NTSTATUS status;
 	TDB_DATA data;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 4d729fdf89..fc6cbae135 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -215,7 +215,7 @@ BOOL test_AddForm(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct spoolss_AddForm r;
 	struct spoolss_AddFormInfo1 form;
 	NTSTATUS status;
-	char *formname = "testform3";
+	const char *formname = "testform3";
 	BOOL ret = True;
 
 	r.in.handle = handle;
diff --git a/source4/torture/utable.c b/source4/torture/utable.c
index 317d7a80cc..2d7ad5a025 100644
--- a/source4/torture/utable.c
+++ b/source4/torture/utable.c
@@ -24,7 +24,7 @@ BOOL torture_utable(int dummy)
 {
 	struct cli_state *cli;
 	fstring fname;
-	char *alt_name;
+	const char *alt_name;
 	int fnum;
 	smb_ucs2_t c2;
 	int c, len, fd;