From 18ae12f9e329cf71db3e6d1f42f5cdbd6d95f46f Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Mon, 28 Aug 2023 11:22:31 +0200 Subject: [PATCH 1/3] File: Drop krb5.h include It looks as if krb5.h was only ever needed together with OpenSSL, then OpenSSL includes were removed, but the krb5.h ones stayed around. References: 610d081c4bd882830541b5b748803f60698ca021 d7c10ca7c36ff5446bee4a623bcb1020e19482b8 --- src/File.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/File.h b/src/File.h index 98b722228d..26ef3c154f 100644 --- a/src/File.h +++ b/src/File.h @@ -7,10 +7,6 @@ #include #include -#ifdef NEED_KRB5_H -#include -#endif // NEED_KRB5_H - #include "zeek/Val.h" #include "zeek/util.h" From 33875c7bf006aaf89e553b0aa5989f65001ce08e Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Mon, 28 Aug 2023 11:29:51 +0200 Subject: [PATCH 2/3] zeek-config.h: Drop NEED_KRB5_H This is unused in the Zeek tree after the previous commit, remove it from zeek-config.h --- cmake_templates/zeek-config.h.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmake_templates/zeek-config.h.in b/cmake_templates/zeek-config.h.in index 7f9fe60a0c..81409c8a09 100644 --- a/cmake_templates/zeek-config.h.in +++ b/cmake_templates/zeek-config.h.in @@ -80,9 +80,6 @@ /* Define if you have the header file. */ #cmakedefine HAVE_SYS_ETHERNET_H -/* Include krb5.h */ -#cmakedefine NEED_KRB5_H - /* Compatibility for Darwin */ #cmakedefine NEED_NAMESER_COMPAT_H From 7664bb691343c2012c698eb8cd9a37d9f70e0932 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Mon, 28 Aug 2023 11:53:41 +0200 Subject: [PATCH 3/3] cmake: Bump submodule for removal of NEED_KRB5_H --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 7a8069c2ee..cbd2497457 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 7a8069c2ee84a82119ce83033454e22942043570 +Subproject commit cbd24974572744064f67b181e100a742c0bb35a2