summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-08-11 16:17:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:57:50 -0500
commit5fa350cb1334a4b888bc65746ed6912a5ed6e7ed (patch)
tree227cd2a52f3b0ade1f239ddc1f56731c4cf40755
parentcc09bddf2982cd06145add560d6d61006351a41f (diff)
downloadsamba-5fa350cb1334a4b888bc65746ed6912a5ed6e7ed.tar.gz
samba-5fa350cb1334a4b888bc65746ed6912a5ed6e7ed.tar.bz2
samba-5fa350cb1334a4b888bc65746ed6912a5ed6e7ed.zip
r1727: SPNEGO session setup replies need to include the blob, even on error
cases, so don't shorten them back to 0 byte data length. Andrew Bartlett (This used to be commit 66c54fe7ebdbe1348731191d86ac4804e99d114e)
-rw-r--r--source4/smb_server/reply.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c
index e705181ef2..915919e9d6 100644
--- a/source4/smb_server/reply.c
+++ b/source4/smb_server/reply.c
@@ -2048,14 +2048,13 @@ static void reply_sesssetup_spnego(struct smbsrv_request *req)
/* call the generic handler */
status = sesssetup_backend(req, &sess);
- if (!NT_STATUS_IS_OK(status)) {
- req_reply_error(req, status);
- return;
- }
-
/* construct reply */
req_setup_reply(req, 4, sess.spnego.out.secblob.length);
+ if (!NT_STATUS_IS_OK(status)) {
+ req_setup_error(req, status);
+ }
+
SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE);
SSVAL(req->out.vwv, VWV(1), 0);
SSVAL(req->out.vwv, VWV(2), sess.spnego.out.action);