Skip to content

Polish SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE macro #2316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yadij wants to merge 3 commits into from
Closed

Polish SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE macro #2316

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5607082
Polish SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE macro
yadij Dec 10, 2025
31d6c73
Add missing dnl trailer
yadij Dec 10, 2025
b3d06e9
Fix copy-n-paste typo
yadij Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions acinclude/krb5.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,27 @@
## Please see the COPYING and CONTRIBUTORS files for details.
##

dnl check whether the Kerberos context has a memory cache
AC_DEFUN([SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE],[
AC_REQUIRE([SQUID_STATE_SAVE])
AC_REQUIRE([SQUID_STATE_ROLLBACK])
AC_REQUIRE([SQUID_DEFINE_BOOL])
AC_CACHE_CHECK([for Kerberos context memory cache],squid_cv_krb5_memory_cache,[
SQUID_STATE_SAVE(squid_krb5_test)
CPPFLAGS="-I${srcdir:-.} $CPPFLAGS"
AC_RUN_IFELSE([
AC_LANG_PROGRAM([[#include "compat/krb5.h"]],[[
krb5_context c;
krb5_ccache cc;
krb5_init_context(&c);
return krb5_cc_resolve(c, "MEMORY:test_cache", &cc);
]])
],[squid_cv_krb5_memory_cache=yes],[squid_cv_krb5_memory_cache=no],[:])
SQUID_STATE_ROLLBACK(squid_krb5_test)
])
SQUID_DEFINE_BOOL(HAVE_KRB5_MEMORY_CACHE,$squid_cv_krb5_memory_cache,[kerberos has MEMORY: cache support])
]) dnl SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE

AC_DEFUN([SQUID_CHECK_SOLARIS_KRB5],[
# no pkg-config for solaris native Kerberos
AS_IF([test "$cross_compiling" = "no" -a "x$with_mit_krb5" != "xyes" -a "x$with_mit_krb5" != "xno"],[
Expand Down Expand Up @@ -42,29 +63,6 @@ AC_DEFUN([SQUID_CHECK_SOLARIS_KRB5],[
])
])

dnl check whether the kerberos context has a memory cache. Sets
dnl squid_cv_memory_cache if that's the case.
AC_DEFUN([SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE],[
AC_CACHE_CHECK([for memory cache], squid_cv_memory_cache, [
SQUID_STATE_SAVE(squid_krb5_test)
CPPFLAGS="-I${srcdir:-.} $CPPFLAGS"
AC_RUN_IFELSE([
AC_LANG_SOURCE([[
#include "compat/krb5.h"
int main(int argc, char *argv[])
{
krb5_context context;
krb5_ccache cc;

krb5_init_context(&context);
return krb5_cc_resolve(context, "MEMORY:test_cache", &cc);
}
]])
], [ squid_cv_memory_cache=yes ], [ squid_cv_memory_cache=no ], [:])
SQUID_STATE_ROLLBACK(squid_krb5_test)
])
])

dnl check whether the kerberos context has a memory keytab. Sets
dnl squid_cv_memory_keytab if that's the case.
AC_DEFUN([SQUID_CHECK_KRB5_CONTEXT_MEMORY_KEYTAB],[
Expand Down Expand Up @@ -275,9 +273,6 @@ AC_DEFUN([SQUID_CHECK_KRB5_FUNCS],[
SQUID_STATE_ROLLBACK(squid_krb5_test)

SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE
SQUID_DEFINE_BOOL(HAVE_KRB5_MEMORY_CACHE,$squid_cv_memory_cache,
[Define if kerberos has MEMORY: cache support])

SQUID_CHECK_KRB5_CONTEXT_MEMORY_KEYTAB
SQUID_DEFINE_BOOL(HAVE_KRB5_MEMORY_KEYTAB,$squid_cv_memory_keytab,
[Define if kerberos has MEMORY: keytab support])
Expand Down
Loading