diff options
| author | Richard Sharpe <sharpe@ns.aus.com> | 2002-08-31 00:12:14 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@ns.aus.com> | 2002-08-31 00:12:14 +0000 |
| commit | 284d6547e2790c0e517da9a655e0e1d4e220d8c3 (patch) | |
| tree | b57e64a21995f31e71250d91bcc48dd5815eed25 | |
| parent | f44c41f4ed3c0c94b313d66aaa3cdf8568392ef7 (diff) | |
Handle the lack of a security blob in negprot response when raw NTLMSSP is
being used properly.
svn path=/trunk/; revision=6149
| -rw-r--r-- | packet-smb.c | 8 | ||||
| -rw-r--r-- | smb.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/packet-smb.c b/packet-smb.c index 9508e08d8e..aa4be82a4d 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.288 2002/08/30 23:49:21 sharpe Exp $ + * $Id: packet-smb.c,v 1.289 2002/08/31 00:12:13 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2358,7 +2358,7 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in * NTLMSSP is in use. We need to save this info */ - if(bc != 16){ + if(bc){ tvbuff_t *gssapi_tvb; proto_tree *gssapi_tree; @@ -2375,6 +2375,7 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in COUNT_BYTES(bc); } else { + smb_saved_info_t *sip = si->sip; /* * There is no blob. We just have to make sure @@ -2382,6 +2383,9 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in * right things ... */ + if (sip) + sip->raw_ntlmssp = 1; + } } break; @@ -2,7 +2,7 @@ * Defines for smb packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: smb.h,v 1.45 2002/08/30 23:49:22 sharpe Exp $ + * $Id: smb.h,v 1.46 2002/08/31 00:12:14 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -233,6 +233,7 @@ typedef struct { nstime_t req_time; guint16 flags; int cmd; + gboolean raw_ntlmssp; /* Do extended security exc use raw ntlmssp */ void *extra_info; } smb_saved_info_t; @@ -283,7 +284,6 @@ typedef struct smb_info { gboolean unicode; /* Are strings in this SMB Unicode? */ gboolean request; /* Is this a request? */ gboolean unidir; - gboolean raw_ntlmssp; /* Do extended security exc use raw ntlmssp */ int info_level; int info_count; smb_saved_info_t *sip; /* smb_saved_info_t, if any, for this */ |