diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-11-04 21:42:02 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-11-04 21:42:02 +0000 |
| commit | f35324d0fd73a8fbbfc922e91823ef6b3a1ae4ec (patch) | |
| tree | a93ec5381270aa4229984585ea3ec7320ccdcf33 /asn1/spnego | |
| parent | a3d5cbf5d82252d097dc4e637fc218a491d30bc5 (diff) | |
Minor cleanup mostly related to proto_reg_handoff
Remove code for unused handles;
Localize handles (in proto_reg_handoff) which need not be global;
Localize (in proto_reg_handoff) "saved prefs";
Use find_dissector instead of create_dissector_handle as appropriate;
Use gboolean for "initialized" flag in proto_reg_handoff.
svn path=/trunk/; revision=26693
Diffstat (limited to 'asn1/spnego')
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index fba8e99a3c..0357465f8c 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -96,8 +96,6 @@ static gint ett_spnego_krb5_cfx_flags = -1; #include "packet-spnego-ett.c" -static dissector_handle_t data_handle; - /* * Unfortunately, we have to have a forward declaration of this, * as the code generated by asn2wrs includes a call before the @@ -1414,9 +1412,8 @@ void proto_reg_handoff_spnego(void) { /* Register protocol with GSS-API module */ - spnego_handle = create_dissector_handle(dissect_spnego, proto_spnego); - spnego_wrap_handle = new_create_dissector_handle(dissect_spnego_wrap, - proto_spnego); + spnego_handle = find_dissector("spnego"); + spnego_wrap_handle = new_create_dissector_handle(dissect_spnego_wrap, proto_spnego); gssapi_init_oid("1.3.6.1.5.5.2", proto_spnego, ett_spnego, spnego_handle, spnego_wrap_handle, "SPNEGO - Simple Protected Negotiation"); @@ -1430,10 +1427,8 @@ void proto_reg_handoff_spnego(void) { * See the archive of <ietf-krb-wg@anl.gov> for the thread topic * SPNEGO implementation issues. 3-Dec-2002. */ - spnego_krb5_handle = create_dissector_handle(dissect_spnego_krb5, - proto_spnego_krb5); - spnego_krb5_wrap_handle = new_create_dissector_handle(dissect_spnego_krb5_wrap, - proto_spnego_krb5); + spnego_krb5_handle = find_dissector("spnego-krb5"); + spnego_krb5_wrap_handle = find_dissector("spnego-krb5-wrap"); gssapi_init_oid("1.2.840.48018.1.2.2", proto_spnego_krb5, ett_spnego_krb5, spnego_krb5_handle, spnego_krb5_wrap_handle, "MS KRB5 - Microsoft Kerberos 5"); @@ -1444,8 +1439,4 @@ void proto_reg_handoff_spnego(void) { spnego_krb5_handle, spnego_krb5_wrap_handle, "KRB5 - Kerberos 5 - User to User"); - /* - * Find the data handle for some calls - */ - data_handle = find_dissector("data"); } |