summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-03-25 15:43:54 -0700
committerJeremy Allison <jra@samba.org>2011-03-26 01:19:55 +0100
commit51d8a4e046aaa6e5aa7ec734c068a382f5731cee (patch)
tree8f3b3bafb2a716d5f827aefbcf4a70cecbcdc306
parentad2e243f8d196a448c2b307feb57a9141c200cd1 (diff)
downloadsamba-51d8a4e046aaa6e5aa7ec734c068a382f5731cee.tar.gz
samba-51d8a4e046aaa6e5aa7ec734c068a382f5731cee.tar.bz2
samba-51d8a4e046aaa6e5aa7ec734c068a382f5731cee.zip
Revert "Fix bug 8021 - Incorrect string termination in volume/volume_name for TRANS2-QUERY_FS_INFO/Info Volume."
This reverts commit 042aafb87df6c05877b8fc7ef0d44877689d860a. I need to test against OS/2 to see if this is something Win28K breaks for older clients before allowing this. Jeremy. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Sat Mar 26 01:19:55 CET 2011 on sn-devel-104
-rw-r--r--source3/smbd/trans2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 693cf02803..12cbc3b9e9 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3015,7 +3015,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
pdata, flags2,
pdata+l2_vol_szVolLabel, vname,
PTR_DIFF(end_data, pdata+l2_vol_szVolLabel),
- STR_NOALIGN);
+ STR_NOALIGN|STR_TERMINATE);
SCVAL(pdata,l2_vol_cch,len);
data_len = l2_vol_szVolLabel + len;
DEBUG(5,("smbd_do_qfsinfo : time = %x, namelen = %d, name = %s\n",