Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/awelzel/ditch-file-krb-include'

Browse source 
* origin/topic/awelzel/ditch-file-krb-include:
  cmake: Bump submodule for removal of NEED_KRB5_H
  zeek-config.h: Drop NEED_KRB5_H
  File: Drop krb5.h include
This commit is contained in:
Arne Welzel 2023-08-28 20:07:16 +02:00
commit d81cb9d10e
5 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGES
View file

@ -1,3 +1,17 @@
6.1.0-dev.343 | 2023-08-28 20:07:16 +0200
* cmake: Bump submodule for removal of NEED_KRB5_H (Arne Welzel, Corelight)
* zeek-config.h: Drop NEED_KRB5_H (Arne Welzel, Corelight)
This is unused in the Zeek tree after the previous commit, remove it
from zeek-config.h
* File: Drop krb5.h include (Arne Welzel, Corelight)
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.
6.1.0-dev.339 | 2023-08-28 10:53:37 -0700 6.1.0-dev.339 | 2023-08-28 10:53:37 -0700
* change Trigger constructor to not potentially auto-delete itself (Vern Paxson, Corelight) * change Trigger constructor to not potentially auto-delete itself (Vern Paxson, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.1.0-dev.339 6.1.0-dev.343

2
cmake

@ -1 +1 @@
Subproject commit 1f709b9f067b29462f8f9e2f30a8eabb7b175a86 Subproject commit d50c51862ec591e88ffae33d33937e2dd4736722

3
cmake_templates/zeek-config.h.in
View file

@ -80,9 +80,6 @@
/* Define if you have the <sys/ethernet.h> header file. */ /* Define if you have the <sys/ethernet.h> header file. */
#cmakedefine HAVE_SYS_ETHERNET_H #cmakedefine HAVE_SYS_ETHERNET_H
/* Include krb5.h */
#cmakedefine NEED_KRB5_H
/* Compatibility for Darwin */ /* Compatibility for Darwin */
#cmakedefine NEED_NAMESER_COMPAT_H #cmakedefine NEED_NAMESER_COMPAT_H

4
src/File.h
View file

@ -7,10 +7,6 @@
#include <string> #include <string>
#include <utility> #include <utility>
#ifdef NEED_KRB5_H
#include <krb5.h>
#endif // NEED_KRB5_H
#include "zeek/Val.h" #include "zeek/Val.h"
#include "zeek/util.h" #include "zeek/util.h"