diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-08-31 22:22:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-08-31 22:22:29 +0000 |
| commit | 4e4000a12d64338eae8242b580c71ffb9b7ff916 (patch) | |
| tree | 154b9210e3d612ab67a39d50067c3acde904e088 /packet-spnego.c | |
| parent | 9a342916066917e55488de3d52e247ff585c6a77 (diff) | |
Make "gssapi_init_oid()" take a dissector handle rather than a
registered dissector name; that means you don't have to register a
dissector by name to associate it with a GSS-API security mechanism OID.
svn path=/trunk/; revision=6163
Diffstat (limited to 'packet-spnego.c')
| -rw-r--r-- | packet-spnego.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/packet-spnego.c b/packet-spnego.c index dc1e096f5b..7d1af673eb 100644 --- a/packet-spnego.c +++ b/packet-spnego.c @@ -4,7 +4,7 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-spnego.c,v 1.21 2002/08/31 20:50:08 sharpe Exp $ + * $Id: packet-spnego.c,v 1.22 2002/08/31 22:22:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -522,7 +522,7 @@ dissect_spnego_supportedMech(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, next_level_dissector = NULL; /* FIXME: Is this right? */ - if (value) next_level_dissector = find_dissector(value->name); + if (value) next_level_dissector = value->handle; /* * Now, we need to save this in per proto info in the @@ -872,14 +872,16 @@ proto_register_spnego(void) proto_register_field_array(proto_spnego, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - - register_dissector("spnego", dissect_spnego, proto_spnego); } void proto_reg_handoff_spnego(void) { + dissector_handle_t spnego_handle; + /* Register protocol with GSS-API module */ - gssapi_init_oid("1.3.6.1.5.5.2", proto_spnego, ett_spnego, "spnego"); + spnego_handle = create_dissector_handle(dissect_spnego, proto_spnego); + gssapi_init_oid("1.3.6.1.5.5.2", proto_spnego, ett_spnego, + spnego_handle); } |