diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-01 15:05:25 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-01 23:05:57 +0000 |
| commit | 5981dab95b87ffd629d6ab6a45289af60c3d3b27 (patch) | |
| tree | b8af9ede813e8b720737c28f2e07be1c3e1f3834 /epan/dissectors/packet-kerberos.h | |
| parent | 445ddc833669e8cff7e66b268d4b4b77faa504cc (diff) | |
Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.
Don't throw its declaration in file.h, as it's not defined in file.c.
Instead, include it in epan/dissectors/packet-kerberos.h and include
that wherever read_keytab_file() is called.
Yes, that means you also have to include <epan/asn1.h> and, therefore,
you have to include <epan/packet.h>. Yes, that should be cleaned up,
perhaps by splitting the Kerberos support code into "stuff that handles
encryption keys without any reference to dissection" and "stuff that
does dissection-related work".
Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef
Reviewed-on: https://code.wireshark.org/review/6210
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-kerberos.h')
| -rw-r--r-- | epan/dissectors/packet-kerberos.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-kerberos.h b/epan/dissectors/packet-kerberos.h index 234b27c803..f86e77ac41 100644 --- a/epan/dissectors/packet-kerberos.h +++ b/epan/dissectors/packet-kerberos.h @@ -101,6 +101,9 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo, extern gboolean krb_decrypt; WS_DLL_PUBLIC +void read_keytab_file(const char *); + +WS_DLL_PUBLIC void read_keytab_file_from_preferences(void); #endif /* HAVE_KERBEROS */ @@ -112,7 +115,7 @@ void read_keytab_file_from_preferences(void); int dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-kerberos-exp.h ---*/ -#line 102 "../../asn1/kerberos/packet-kerberos-template.h" +#line 105 "../../asn1/kerberos/packet-kerberos-template.h" #ifdef __cplusplus } |