summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-06-04 06:03:21 +0000
committerAndrew Tridgell <tridge@samba.org>2003-06-04 06:03:21 +0000
commitb6cb0e914d10524721d51fb01fcd84d476f30157 (patch)
treeccbb79f9aff975873cf522db2255b8f087cdf9d7
parent878944f1ec521eb70f3e28cd12abef4c21edcbf6 (diff)
downloadsamba-b6cb0e914d10524721d51fb01fcd84d476f30157.tar.gz
samba-b6cb0e914d10524721d51fb01fcd84d476f30157.tar.bz2
samba-b6cb0e914d10524721d51fb01fcd84d476f30157.zip
fixed the termination of several trans2 strings
(This used to be commit 8f23ad3054febe47b667172d680d2d19ad141416)
-rw-r--r--source3/smbd/trans2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index dcbb543c64..4498f0727b 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1368,7 +1368,7 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
* the called hostname and the service name.
*/
SIVAL(pdata,0,str_checksum(lp_servicename(snum)) ^ (str_checksum(local_machine)<<16) );
- len = srvstr_push(outbuf, pdata+l2_vol_szVolLabel, vname, -1, STR_TERMINATE);
+ len = srvstr_push(outbuf, pdata+l2_vol_szVolLabel, vname, -1, 0);
SCVAL(pdata,l2_vol_cch,len);
data_len = l2_vol_szVolLabel + len;
DEBUG(5,("call_trans2qfsinfo : time = %x, namelen = %d, name = %s\n",
@@ -1397,7 +1397,7 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
case SMB_QUERY_FS_LABEL_INFO:
case SMB_FS_LABEL_INFORMATION:
- len = srvstr_push(outbuf, pdata+4, vname, -1, STR_TERMINATE);
+ len = srvstr_push(outbuf, pdata+4, vname, -1, 0);
data_len = 4 + len;
SIVAL(pdata,0,len);
break;
@@ -1412,7 +1412,7 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
SIVAL(pdata,8,str_checksum(lp_servicename(snum)) ^
(str_checksum(local_machine)<<16));
- len = srvstr_push(outbuf, pdata+18, vname, -1, STR_TERMINATE);
+ len = srvstr_push(outbuf, pdata+18, vname, -1, 0);
SIVAL(pdata,12,len);
data_len = 18+len;
DEBUG(5,("call_trans2qfsinfo : SMB_QUERY_FS_VOLUME_INFO namelen = %d, vol=%s serv=%s\n",