4 files changed, 5 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_acct.c b/source3/nsswitch/winbindd_acct.c
index 2c8b7cae28..cd0b5b7e06 100644
--- a/source3/nsswitch/winbindd_acct.c
+++ b/source3/nsswitch/winbindd_acct.c
@@ -222,7 +222,7 @@ static WINBINDD_GR* string2group( char *string )
 			gr_members = SMB_XMALLOC_ARRAY(char*, num_gr_members+1);
 			
 			i = 0;
-			while ( next_token(&str, buffer, ",", sizeof(buffer)) && i<num_gr_members ) {
+			while ( next_token((const char **) &str, buffer, ",", sizeof(buffer)) && i<num_gr_members ) {
 				gr_members[i++] = smb_xstrdup(buffer);
 			}
 
diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h
index 88e3254d24..838ba1e211 100644
--- a/source3/nsswitch/winbindd_nss.h
+++ b/source3/nsswitch/winbindd_nss.h
@@ -11,7 +11,7 @@
 */
 
 #ifndef SAFE_FREE
-#define SAFE_FREE(x) do { if(x) {free(x); x=NULL;} } while(0)
+#define SAFE_FREE(x) do { if(x) {free((void *) (x)); x=NULL;} } while(0)
 #endif
 
 #ifndef _WINBINDD_NTDOM_H
diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index 99d12563c6..5e974736e3 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -788,7 +788,8 @@ static int get_ldap_seq(const char *server, int port, uint32 *seq)
 	to.tv_sec = 10;
 	to.tv_usec = 0;
 
-	if (ldap_search_st(ldp, "", LDAP_SCOPE_BASE, "(objectclass=*)", &attrs[0], 0, &to, &res))
+	if (ldap_search_st(ldp, "", LDAP_SCOPE_BASE, "(objectclass=*)",
+                           (char **) &attrs[0], 0, &to, &res))
 		goto done;
 
 	if (ldap_count_entries(ldp, res) != 1)
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 11da05ac3b..3d03d6f4cc 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -636,7 +636,7 @@ BOOL parse_domain_user(const char *domuser, fstring domain, fstring user)
 */
 void fill_domain_username(fstring name, const char *domain, const char *user)
 {
-	strlower_m( user );
+        strlower_m( (char *) user );
 
 	if (assume_domain(domain)) {
 		strlcpy(name, user, sizeof(fstring));