summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-12-01 19:52:09 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-12-01 19:52:09 +0000
commita65dc990f85a627091f30ee7e079ef6c6814c054 (patch)
treea7c89d03367a40d49d9df33ad53fe01f26ab2696 /source3
parent9de7abd8db1336ef6223503889656edd77f74a6b (diff)
downloadsamba-a65dc990f85a627091f30ee7e079ef6c6814c054.tar.gz
samba-a65dc990f85a627091f30ee7e079ef6c6814c054.tar.bz2
samba-a65dc990f85a627091f30ee7e079ef6c6814c054.zip
As per Jeremy's request back this out, so as to re-gain the implicit length
check. Andrew Bartlett (This used to be commit 323088259f19f59008160d56fbcb9df6a6cd0d98)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d09beb7429..2c29ffdf51 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -202,7 +202,7 @@ int reply_tcon(connection_struct *conn,
int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int length,int bufsize)
{
- const char *service;
+ fstring service;
DATA_BLOB password;
pstring devicename;
NTSTATUS nt_status;
@@ -213,7 +213,7 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
extern BOOL global_encrypted_passwords_negotiated;
START_PROFILE(SMBtconX);
- *devicename = 0;
+ *service = *devicename = 0;
/* we might have to close an old one */
if ((SVAL(inbuf,smb_vwv2) & 0x1) && conn) {
@@ -233,28 +233,26 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
}
p = smb_buf(inbuf) + passlen;
-
p += srvstr_pull_buf(inbuf, path, p, sizeof(path), STR_TERMINATE);
/*
* the service name can be either: \\server\share
* or share directly like on the DELL PowerVault 705
*/
-
if (*path=='\\') {
q = strchr_m(path+2,'\\');
if (!q) {
END_PROFILE(SMBtconX);
return(ERROR_DOS(ERRDOS,ERRnosuchshare));
}
- service = q+1;
+ fstrcpy(service,q+1);
}
else
- service = path;
+ fstrcpy(service,path);
p += srvstr_pull(inbuf, devicename, p, sizeof(devicename), 6, STR_ASCII);
- DEBUG(4,("Got device type %s for %s\n",devicename, service));
+ DEBUG(4,("Got device type %s\n",devicename));
conn = make_connection(service,password,devicename,vuid,&nt_status);