fix some warnings found by the Sun C compiler

(This used to be commit e1fac713e25692a5790c3261ba323732930f5249)

7 files changed, 8 insertions, 10 deletions

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index fd51f3c57d..e7c200218e 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -841,5 +841,5 @@ UNISTR2* ucs2_to_unistr2(TALLOC_CTX *ctx, UNISTR2* dst, smb_ucs2_t* src)
 	strncpy_w(dst->buffer, src, dst->uni_max_len);
 	
 	return dst;
-};
+}
 
diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 4c86cd0f94..f8a97effee 100644
--- a/source3/msdfs/msdfs.c
+++ b/source3/msdfs/msdfs.c
@@ -330,8 +330,8 @@ BOOL dfs_redirect(char* pathname, connection_struct* conn,
 			 pathname));
 		return False;
 	}
+
 	/* never reached */
-	return False;
 }
 
 /**********************************************************************
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 25de4eff71..850a0b1a2d 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -895,6 +895,5 @@ BOOL get_trust_pw(const char *domain, uint8 ret_pwd[16],
 	}
 	
 	/* Failure */
-	return False;
 }
 
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 635b7e7135..f985ee9979 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -655,7 +655,7 @@ done:
 	prs_mem_free(&rbuf);
 	
 	return result;
-};
+}
 
 /* Enumerate domain groups */
 
diff --git a/source3/tdb/tdbutil.c b/source3/tdb/tdbutil.c
index b01dacd0f5..bae9a8b9d4 100644
--- a/source3/tdb/tdbutil.c
+++ b/source3/tdb/tdbutil.c
@@ -807,7 +807,7 @@ TDB_LIST_NODE *tdb_search_keys(TDB_CONTEXT *tdb, const char* pattern)
 	
 	return list;
 
-};
+}
 
 
 /**
@@ -825,6 +825,6 @@ void tdb_search_list_free(TDB_LIST_NODE* node)
 		SAFE_FREE(node);
 		node = next_node;
 	};
-};
+}
 
 
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 323f4afbc3..06a8daa775 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -508,9 +508,8 @@ int net_groupmap(int argc, const char **argv)
 		return -1;
 	}
 	
-	return net_run_function(argc, argv, func, net_help_groupmap);
-	if ( 0 == argc )
-		return net_help_groupmap( argc, argv );
+	if ( argc )
+		return net_run_function(argc, argv, func, net_help_groupmap);
 
 	return net_help_groupmap( argc, argv );
 }
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index fefc5af365..85818152d1 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -1976,7 +1976,7 @@ static NTSTATUS rpc_query_domain_sid(const DOM_SID *domain_sid, struct cli_state
 	sid_to_string(str_sid, domain_sid);
 	d_printf("%s\n", str_sid);
 	return NT_STATUS_OK;
-};
+}
 
 
 static int rpc_trustdom_list(int argc, const char **argv)