From d11757d5b36ca1e8d771c1b7326963299bb53a08 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 18 Jul 2004 04:03:26 +0000 Subject: [PATCH] Declare "wrap_dissect_gssapi_verf()" in "packet-gssapi.h", and, in "packet-kerberos.c", get the declaration from that header. svn path=/trunk/; revision=11408 --- packet-gssapi.h | 4 ++++ packet-kerberos.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packet-gssapi.h b/packet-gssapi.h index 17fef33317..761b8b4c1d 100644 --- a/packet-gssapi.h +++ b/packet-gssapi.h @@ -45,4 +45,8 @@ gssapi_init_oid(char *oid, int proto, int ett, dissector_handle_t handle, gssapi_oid_value * gssapi_lookup_oid(subid_t *oid, guint oid_len); +int wrap_dissect_gssapi_verf(tvbuff_t *tvb, int offset, + packet_info *pinfo, + proto_tree *tree, guint8 *drep); + #endif /* __PACKET_GSSAPI_H */ diff --git a/packet-kerberos.c b/packet-kerberos.c index 20725952af..a84046d179 100644 --- a/packet-kerberos.c +++ b/packet-kerberos.c @@ -68,6 +68,9 @@ #include "packet-dcerpc-netlogon.h" #include "packet-dcerpc.h" +#include "asn1.h" /* for "subid_t" */ +#include "packet-gssapi.h" + #define UDP_PORT_KERBEROS 88 #define TCP_PORT_KERBEROS 88 @@ -3909,11 +3912,6 @@ static int wrap_dissect_gss_kerb(tvbuff_t *tvb, int offset, packet_info *pinfo, } -/* from packet-gssapi.c */ -extern int wrap_dissect_gssapi_verf(tvbuff_t *tvb, int offset, - packet_info *pinfo, - proto_tree *tree, guint8 *drep); - static dcerpc_auth_subdissector_fns gss_kerb_auth_fns = { wrap_dissect_gss_kerb, /* Bind */ wrap_dissect_gss_kerb, /* Bind ACK */