Fix warning, prototype.

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3a7400657efc3fb8a879c2dd54772eb8c74b7dca..08c1e2c81043b28b6f5260b041f2a1a0c09645b5 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1662,7 +1662,7 @@ int fstr_sprintf(fstring s, const char *fmt, ...);
 char **str_list_make(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
 char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list);
 bool str_list_compare(char **list1, char **list2);
-size_t str_list_length( const char **list );
+size_t str_list_length( const char * const*list );
 bool str_list_sub_basic( char **list, const char *smb_name,
                         const char *domain_name );
 bool str_list_substitute(char **list, const char *pattern, const char *insert);

diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 92f0a4400546cc6a9a7b43ef325d817ca490327b..0c3d0320685da9cf151bd27db6d27fc9e3d618c2 100644 (file)
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -491,7 +491,7 @@ static const struct {
 **/
 _PUBLIC_ void set_socket_options(int fd, const char *options)
 {
-       const char **options_list = str_list_make(NULL, options, " \t,");
+       const char **options_list = (const char **)str_list_make(NULL, options, " \t,");
        int j;
 
        if (!options_list)