summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-03-28 02:00:19 +0000
committerGerald Carter <jerry@samba.org>2003-03-28 02:00:19 +0000
commit0995fb1eef32938294c76011a5d5b170ae963ec0 (patch)
tree149d1713565d576cc32d5edb9f46e436c3b42d84
parent893cbb759268bb114dcb873fef9f588eaad5263c (diff)
downloadsamba-0995fb1eef32938294c76011a5d5b170ae963ec0.tar.gz
samba-0995fb1eef32938294c76011a5d5b170ae963ec0.tar.bz2
samba-0995fb1eef32938294c76011a5d5b170ae963ec0.zip
fix up IPC/LPT:/A: devicetype in tcon_and_X
(This used to be commit a9ccae314fdb4b96115d31083f1a4b26209d597c)
-rw-r--r--source3/smbd/reply.c41
1 files changed, 20 insertions, 21 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index bf74d997b8..70f5e0aba2 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -204,16 +204,21 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
{
fstring service;
DATA_BLOB password;
- fstring devicename;
+
+ /* what the cleint thinks the device is */
+ fstring client_devicetype;
+ /* what the server tells the client the share represents */
+ const char *server_devicetype;
NTSTATUS nt_status;
uint16 vuid = SVAL(inbuf,smb_uid);
int passlen = SVAL(inbuf,smb_vwv3);
pstring path;
char *p, *q;
extern BOOL global_encrypted_passwords_negotiated;
+
START_PROFILE(SMBtconX);
- *service = *devicename = 0;
+ *service = *client_devicetype = 0;
/* we might have to close an old one */
if ((SVAL(inbuf,smb_vwv2) & 0x1) && conn) {
@@ -250,11 +255,11 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
else
fstrcpy(service,path);
- p += srvstr_pull(inbuf, devicename, p, sizeof(devicename), 6, STR_ASCII);
+ p += srvstr_pull(inbuf, client_devicetype, p, sizeof(client_devicetype), 6, STR_ASCII);
- DEBUG(4,("Got device type %s\n",devicename));
+ DEBUG(4,("Client requested device type [%s] for share [%s]\n", client_devicetype, service));
- conn = make_connection(service,password,devicename,vuid,&nt_status);
+ conn = make_connection(service,password,client_devicetype,vuid,&nt_status);
data_blob_clear_free(&password);
@@ -263,37 +268,31 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
return ERROR_NT(nt_status);
}
+ if ( IS_IPC(conn) )
+ server_devicetype = "IPC";
+ else if ( IS_PRINT(conn) )
+ server_devicetype = "LPT:";
+ else
+ server_devicetype = "A:";
+
if (Protocol < PROTOCOL_NT1) {
set_message(outbuf,2,0,True);
p = smb_buf(outbuf);
- p += srvstr_push(outbuf, p, devicename, -1,
+ p += srvstr_push(outbuf, p, server_devicetype, -1,
STR_TERMINATE|STR_ASCII);
set_message_end(outbuf,p);
} else {
/* NT sets the fstype of IPC$ to the null string */
const char *fsname = IS_IPC(conn) ? "" : lp_fstype(SNUM(conn));
- const char *devicetype;
-
+
set_message(outbuf,3,0,True);
- if ( IS_IPC(conn) )
- devicetype = "IPC";
- else if ( IS_PRINT(conn) )
- devicetype = "LPT:";
- else
- devicetype = "A:";
-
p = smb_buf(outbuf);
- p += srvstr_push(outbuf, p, IS_IPC(conn) ? "IPC" : devicetype, -1,
+ p += srvstr_push(outbuf, p, server_devicetype, -1,
STR_TERMINATE|STR_ASCII);
p += srvstr_push(outbuf, p, fsname, -1,
STR_TERMINATE);
p = smb_buf(outbuf);
- p += srvstr_push(outbuf, p, IS_IPC(conn) ? "IPC" : devicename, -1,
- STR_TERMINATE|STR_ASCII);
- p += srvstr_push(outbuf, p, fsname, -1,
- STR_TERMINATE);
-
set_message_end(outbuf,p);
/* what does setting this bit do? It is set by NT4 and