aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-kerberos.c
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2009-04-08 19:15:10 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2009-04-08 19:15:10 +0000
commita15f3b506ca18f96afbfa2ed80fbcb8808810168 (patch)
tree91a437cc37fc5231e8ab7dbe3c815d81ff9b755f /epan/dissectors/packet-kerberos.c
parenta823a0edb2dd8b3dc9bf7ca8013f214641effaa1 (diff)
Don't assemble asm_utils_win32_x86 on x64. Export a dummy read_keytab_file
if we're not using any encryption libraries on Windows. This fixes the last Win64 compilation problems in epan. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28008 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-kerberos.c')
-rw-r--r--epan/dissectors/packet-kerberos.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index e8a303a3db..a04b4f3348 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -419,6 +419,12 @@ printf("added key in %u keytype:%d len:%d\n",pinfo->fd->num, keytype, keyleng
}
#endif /* HAVE_HEIMDAL_KERBEROS || HAVE_MIT_KERBEROS */
+#if defined(_WIN32) && !defined(HAVE_HEIMDAL_KERBEROS) && !defined(HAVE_MIT_KERBEROS) && !defined(HAVE_LIBNETTLE)
+void
+read_keytab_file(const char *filename _U_)
+{
+}
+#endif
#ifdef HAVE_MIT_KERBEROS