Fix a crash in _dfs_Enum

(cherry picked from commit 4a996476297963d4cb300b4d45c23e83a493c339)

diff --git a/source/include/msdfs.h b/source/include/msdfs.h
index 49b3ad4949f531f47bdef3c7f24eacd7342b200a..4551325843042b5d03b3c3cb9ef44c349108ce82 100644 (file)
--- a/source/include/msdfs.h
+++ b/source/include/msdfs.h
@@ -52,7 +52,7 @@ struct referral {
 struct junction_map {
        char *service_name;
        char *volume_name;
-       char *comment;
+       const char *comment;
        int referral_count;
        struct referral* referral_list;
 };

diff --git a/source/smbd/msdfs.c b/source/smbd/msdfs.c
index 0bbc75250289e82ced55e1dc8f4845b32c2dab7c..baf41bdbbf311f1aafc154f1893053cd059d624f 100644 (file)
--- a/source/smbd/msdfs.c
+++ b/source/smbd/msdfs.c
@@ -1502,6 +1502,7 @@ static int form_junctions(TALLOC_CTX *ctx,
        if (!jucn[cnt].service_name || !jucn[cnt].volume_name) {
                goto out;
        }
+       jucn[cnt].comment = "";
        jucn[cnt].referral_count = 1;
 
        ref = jucn[cnt].referral_list = TALLOC_ZERO_P(ctx, struct referral);
@@ -1561,6 +1562,7 @@ static int form_junctions(TALLOC_CTX *ctx,
                                                !jucn[cnt].volume_name) {
                                        goto out;
                                }
+                               jucn[cnt].comment = "";
                                cnt++;
                        }
                }