The branch, master has been updated
       via  51d8a4e Revert "Fix bug 8021 - Incorrect string termination in 
volume/volume_name for TRANS2-QUERY_FS_INFO/Info Volume."
      from  ad2e243 Fix bug 8040 - smbclient segfaults when a Cyrillic netbios 
name or workgroup is configured.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 51d8a4e046aaa6e5aa7ec734c068a382f5731cee
Author: Jeremy Allison <[email protected]>
Date:   Fri Mar 25 15:43:54 2011 -0700

    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 <[email protected]>
    Autobuild-Date: Sat Mar 26 01:19:55 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/trans2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 693cf02..12cbc3b 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",


-- 
Samba Shared Repository

Reply via email to