Revert 918b5a7e057bd91289ec06b3ef8d95da43a50ede. This code

should *not* return const.
Jeremy.

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 2136388eb431ee83deb4109b3f75ce5165b0bed2..9a0b12adea0fc39de887bb20fb0e481424c921be 100644 (file)
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -2430,10 +2430,10 @@ char *escape_shell_string(const char *src)
 
 #define S_LIST_ABS 16 /* List Allocation Block Size */
 
-const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
+char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
        const char *sep)
 {
-       const char **list;
+       char **list;
        const char *str;
        char *s, *tok;
        int num, lsize;
@@ -2441,7 +2441,7 @@ const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
        if (!string || !*string)
                return NULL;
 
-       list = TALLOC_ARRAY(mem_ctx, const char *, S_LIST_ABS+1);
+       list = TALLOC_ARRAY(mem_ctx, char *, S_LIST_ABS+1);
        if (list == NULL) {
                return NULL;
        }
@@ -2461,11 +2461,11 @@ const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
        while (next_token_talloc(list, &str, &tok, sep)) {
 
                if (num == lsize) {
-                       const char **tmp;
+                       char **tmp;
 
                        lsize += S_LIST_ABS;
 
-                       tmp = TALLOC_REALLOC_ARRAY(mem_ctx, list, const char *,
+                       tmp = TALLOC_REALLOC_ARRAY(mem_ctx, list, char *,
                                                   lsize + 1);
                        if (tmp == NULL) {
                                DEBUG(0,("str_list_make: "
@@ -2477,7 +2477,7 @@ const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
                        list = tmp;
 
                        memset (&list[num], 0,
-                               ((sizeof(const char**)) * (S_LIST_ABS +1)));
+                               ((sizeof(char**)) * (S_LIST_ABS +1)));
                }
 
                list[num] = tok;