summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-06-22 13:06:35 +0200
committerVolker Lendecke <vl@samba.org>2008-06-22 13:08:47 +0200
commit65f7457583e7074ab5c07aa23f1281289fe66359 (patch)
tree7d4e809f96a89fb8853f41275af18c9ac09e2eaa /source3
parent62f69165f6b66e149055ba431a48aab1a67c4215 (diff)
downloadsamba-65f7457583e7074ab5c07aa23f1281289fe66359.tar.gz
samba-65f7457583e7074ab5c07aa23f1281289fe66359.tar.bz2
samba-65f7457583e7074ab5c07aa23f1281289fe66359.zip
Fix a crash in _dfs_Enum
(cherry picked from commit 4a996476297963d4cb300b4d45c23e83a493c339) (This used to be commit 86cae83a7db87063ecd6e58eaa15f11441c45040)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/msdfs.h2
-rw-r--r--source3/smbd/msdfs.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h
index 49b3ad4949..4551325843 100644
--- a/source3/include/msdfs.h
+++ b/source3/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/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index bdcdc92df2..84ee282372 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1504,6 +1504,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);
@@ -1563,6 +1564,7 @@ static int form_junctions(TALLOC_CTX *ctx,
!jucn[cnt].volume_name) {
goto out;
}
+ jucn[cnt].comment = "";
cnt++;
}
}