diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2009-10-09 20:16:23 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2009-10-09 20:16:23 +0000 |
| commit | fc7304c1a2a68ffd870a8a1709045b72ecdab8d7 (patch) | |
| tree | 4bb65eb0bfde9aea757a799b73560515c9330623 /epan/dissectors/packet-kerberos.c | |
| parent | d2ad0108925405ab27e8fc61d8525c308092bb37 (diff) | |
If we're on Windows and we don't have kerberos, define a dummy version of read_keytab_file_from_preferences to keep the linker happy (since this function is in libwireshark.def).
svn path=/trunk/; revision=30445
Diffstat (limited to 'epan/dissectors/packet-kerberos.c')
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index b4f527682d..be79e7a3ec 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -415,6 +415,16 @@ read_keytab_file_from_preferences(void) read_keytab_file(last_keytab); } +#elif defined(_WIN32) + +/* Dummy version to allow us to put this function in libwireshark.def--even + * on systems without KERBEROS. + */ +void +read_keytab_file_from_preferences(void) +{ +} + #endif #if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS) @@ -2710,8 +2720,8 @@ dissect_krb5_PAC_UPN_DNS_INFO(proto_tree *parent_tree, tvbuff_t *tvb, int offset proto_tree_add_item(tree, hf_krb_pac_upn_dns_offset, tvb, offset, 2, TRUE); offset+=2; - /* flags */ - proto_tree_add_item(tree, hf_krb_pac_upn_flags, tvb, offset, 4, TRUE); + /* flags */ + proto_tree_add_item(tree, hf_krb_pac_upn_flags, tvb, offset, 4, TRUE); /* upn */ offset = upn_offset; |