summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-06-22 13:06:35 +0200
committerKarolin Seeger <kseeger@samba.org>2008-06-23 09:21:30 +0200
commit2c1213b38cdabc58dd9a6a3587bb30cf1fe77e3c (patch)
tree9be503aaaac5cfa0baea8ae61f24d6e4e940e1c1
parente9f57680b16e18f56e396746c82a7245cbcf5701 (diff)
downloadsamba-2c1213b38cdabc58dd9a6a3587bb30cf1fe77e3c.tar.gz
Fix a crash in _dfs_Enum
(cherry picked from commit 4a996476297963d4cb300b4d45c23e83a493c339)
-rw-r--r--source/include/msdfs.h2
-rw-r--r--source/smbd/msdfs.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/source/include/msdfs.h b/source/include/msdfs.h
index 49b3ad4949f..45513258430 100644
--- 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 0bbc7525028..baf41bdbbf3 100644
--- 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++;
}
}