summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-07-30 10:20:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:02 -0500
commit09b3d2525249fd832b7d46a19921a87a13b71407 (patch)
tree04b7ff7dd8d8840eccd43a9f2e918ff2b05fcdff /source3
parent31dc9126c1f401ac8668b3c46e28c5a47d34a090 (diff)
downloadsamba-09b3d2525249fd832b7d46a19921a87a13b71407.tar.gz
samba-09b3d2525249fd832b7d46a19921a87a13b71407.tar.bz2
samba-09b3d2525249fd832b7d46a19921a87a13b71407.zip
r24077: Convert reply_tdis to the new API
(This used to be commit bd0cb48dde401f48dec98fa7ca794a912e0244f1)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/process.c2
-rw-r--r--source3/smbd/reply.c17
2 files changed, 8 insertions, 11 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 85e061710d..fdec2d106d 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -747,7 +747,7 @@ static const struct smb_message_struct {
/* 0x6e */ { NULL, NULL, NULL, 0 },
/* 0x6f */ { NULL, NULL, NULL, 0 },
/* 0x70 */ { "SMBtcon",reply_tcon,NULL,0},
-/* 0x71 */ { "SMBtdis",reply_tdis,NULL,DO_CHDIR},
+/* 0x71 */ { "SMBtdis",NULL,reply_tdis,DO_CHDIR},
/* 0x72 */ { "SMBnegprot",NULL,reply_negprot,0},
/* 0x73 */ { "SMBsesssetupX",NULL,reply_sesssetup_and_X,0},
/* 0x74 */ { "SMBulogoffX", reply_ulogoffX,NULL, 0}, /* ulogoff doesn't give a valid TID */
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index c347182b99..7af0807c0a 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3704,27 +3704,24 @@ int reply_unlock(connection_struct *conn, char *inbuf,char *outbuf, int size,
conn POINTER CAN BE NULL HERE !
****************************************************************************/
-int reply_tdis(connection_struct *conn,
- char *inbuf,char *outbuf, int dum_size, int dum_buffsize)
+void reply_tdis(connection_struct *conn, struct smb_request *req)
{
- int outsize = set_message(inbuf,outbuf,0,0,False);
- uint16 vuid;
START_PROFILE(SMBtdis);
- vuid = SVAL(inbuf,smb_uid);
-
if (!conn) {
DEBUG(4,("Invalid connection in tdis\n"));
+ reply_doserror(req, ERRSRV, ERRinvnid);
END_PROFILE(SMBtdis);
- return ERROR_DOS(ERRSRV,ERRinvnid);
+ return;
}
conn->used = False;
- close_cnum(conn,vuid);
-
+ close_cnum(conn,req->vuid);
+
+ reply_outbuf(req, 0, 0);
END_PROFILE(SMBtdis);
- return outsize;
+ return;
}
/****************************************************************************