diff options
| author | Richard Sharpe <sharpe@ns.aus.com> | 2002-08-29 00:35:55 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@ns.aus.com> | 2002-08-29 00:35:55 +0000 |
| commit | e0523f9acb86285d943f3f2d679d4ad6324bd41d (patch) | |
| tree | 853795cd26f58c859cd14753681917d4def10dde /packet-spnego.c | |
| parent | 25c3026203a25c6bb2c9523ea4fcdbbec84351e9 (diff) | |
| download | wireshark-e0523f9acb86285d943f3f2d679d4ad6324bd41d.tar.gz wireshark-e0523f9acb86285d943f3f2d679d4ad6324bd41d.tar.bz2 wireshark-e0523f9acb86285d943f3f2d679d4ad6324bd41d.zip | |
Fix up dissect_file_attributes
svn path=/trunk/; revision=6119
Diffstat (limited to 'packet-spnego.c')
| -rw-r--r-- | packet-spnego.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/packet-spnego.c b/packet-spnego.c index 1aa05959eb..407333d317 100644 --- a/packet-spnego.c +++ b/packet-spnego.c @@ -4,7 +4,11 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-spnego.c,v 1.7 2002/08/28 21:00:35 jmayer Exp $ +<<<<<<< packet-spnego.c + * $Id: packet-spnego.c,v 1.8 2002/08/29 00:35:55 sharpe Exp $ +======= + * $Id: packet-spnego.c,v 1.8 2002/08/29 00:35:55 sharpe Exp $ +>>>>>>> 1.7 * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -126,12 +130,12 @@ dissect_spnego_mechTypes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, goto done; } - item = proto_tree_add_item( tree, hf_spnego_mechtype, tvb, offset, - length, FALSE); - subtree = proto_item_add_subtree(item, ett_spnego_mechtype); - offset = hnd->offset; + item = proto_tree_add_item( tree, hf_spnego_mechtype, tvb, offset, + len1, FALSE); + subtree = proto_item_add_subtree(item, ett_spnego_mechtype); + /* * Now, the object IDs ... We should translate them: FIXME */ @@ -242,7 +246,7 @@ dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, gchar *oid_string; proto_item *sub_item; proto_tree *oid_subtree; - int ret, offset = 0; + int ret; int length = tvb_length_remaining(tvb, offset); item = proto_tree_add_item( tree, hf_spnego_negtokeninit, tvb, offset, |