From: morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Fri, 9 Oct 2009 20:16:23 +0000 (+0000)
Subject: If we're on Windows and we don't have kerberos, define a dummy version of read_keytab... 
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=4c5007291b0e82ed99e9d051acd4b62f67856b81;p=obnox%2Fwireshark%2Fwip.git

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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30445 f5534014-38df-0310-8fa8-9805f1628bb7
---

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;