aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packet-smb.c18
-rw-r--r--smb.h3
2 files changed, 18 insertions, 3 deletions
diff --git a/packet-smb.c b/packet-smb.c
index 2e1838176a..9508e08d8e 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.287 2002/08/29 19:05:41 guy Exp $
+ * $Id: packet-smb.c,v 1.288 2002/08/30 23:49:21 sharpe Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2353,7 +2353,12 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in
tvb, offset, bc, TRUE);
/* security blob */
- if(bc){
+ /*
+ * If Extended security and BCC == 16, then raw
+ * NTLMSSP is in use. We need to save this info
+ */
+
+ if(bc != 16){
tvbuff_t *gssapi_tvb;
proto_tree *gssapi_tree;
@@ -2369,6 +2374,15 @@ dissect_negprot_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in
COUNT_BYTES(bc);
}
+ else {
+
+ /*
+ * There is no blob. We just have to make sure
+ * that subsequent routines know to call the
+ * right things ...
+ */
+
+ }
}
break;
}
diff --git a/smb.h b/smb.h
index 98d17e0ac7..343d29d142 100644
--- a/smb.h
+++ b/smb.h
@@ -2,7 +2,7 @@
* Defines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: smb.h,v 1.44 2002/08/28 21:00:41 jmayer Exp $
+ * $Id: smb.h,v 1.45 2002/08/30 23:49:22 sharpe Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -283,6 +283,7 @@ 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 */