summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-01-05 23:48:04 +0000
committerAndrew Bartlett <abartlet@samba.org>2004-01-05 23:48:04 +0000
commit1c9fa70c7cf16ad407f9da68b5159a0d4dc298bc (patch)
tree80a2c8fc4f071d3c09544df35a71731b16487da1
parented8e23c3875c87dd867dd21e06242fad57b881d0 (diff)
downloadsamba-1c9fa70c7cf16ad407f9da68b5159a0d4dc298bc.tar.gz
samba-1c9fa70c7cf16ad407f9da68b5159a0d4dc298bc.tar.bz2
samba-1c9fa70c7cf16ad407f9da68b5159a0d4dc298bc.zip
(merge from 3.0)
Even if the 'device type' is always an ascii string, use push_string to get it out onto the wire. Avoids valgrind warnings because the fstrcpy() causes part of the wire buffer to be 'marked'. Andrew Bartlett (This used to be commit 326becbde23c8039e1f0f00930bcab094bf91ed2)
-rw-r--r--source3/libsmb/cliconnect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index b140c772a2..28de7fc9f3 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -903,7 +903,7 @@ BOOL cli_send_tconX(struct cli_state *cli,
memcpy(p,pword,passlen);
p += passlen;
p += clistr_push(cli, p, fullshare, -1, STR_TERMINATE |STR_UPPER);
- fstrcpy(p, dev); p += strlen(dev)+1;
+ p += clistr_push(cli, p, dev, -1, STR_TERMINATE |STR_UPPER | STR_ASCII);
cli_setup_bcc(cli, p);