Skip to content
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

Remove krb5_get_max_time_skew portability hack #1875

Closed
wants to merge 5 commits into from
Closed

Remove krb5_get_max_time_skew portability hack #1875

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
673ed92
Drop krb5_get_max_time_skew portability hack
yadij Jul 31, 2024
e9200a7
Drop unused SQUID_CHECK_MAX_SKEW_IN_KRB5_CONTEXT
yadij Jul 31, 2024
7cce5b6
fixup
yadij Jul 31, 2024
af66cc4
Merge branch 'master' into arc-autoconf-ng-13-b
yadij Sep 17, 2024
799c8c5
Merge branch 'master' into arc-autoconf-ng-13-b
yadij Nov 22, 2024
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
20 changes: 0 additions & 20 deletions acinclude/krb5.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,23 +105,6 @@ main(void)
SQUID_DEFINE_BOOL(HAVE_BROKEN_HEIMDAL_KRB5_H,$squid_cv_broken_heimdal_krb5_h,[Heimdal krb5.h is broken for C++])
]) dnl SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H

dnl check the max skew in the krb5 context, and sets squid_cv_max_skew_context
AC_DEFUN([SQUID_CHECK_MAX_SKEW_IN_KRB5_CONTEXT],[
AC_CACHE_CHECK([for max_skew in struct krb5_context],
squid_cv_max_skew_context, [
SQUID_STATE_SAVE(squid_krb5_test)
CPPFLAGS="-I${srcdir:-.} $CPPFLAGS"
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#include "compat/krb5.h"
krb5_context kc; kc->max_skew = 1;
]])
],[ squid_cv_max_skew_context=yes ],
[ squid_cv_max_skew_context=no ])
SQUID_STATE_ROLLBACK(squid_krb5_test)
])
])

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],[
Expand Down Expand Up @@ -315,9 +298,6 @@ AC_DEFUN([SQUID_CHECK_KRB5_FUNCS],[
AC_CHECK_LIB(krb5,krb5_get_init_creds_keytab,
AC_DEFINE(HAVE_GET_INIT_CREDS_KEYTAB,1,
[Define to 1 if you have krb5_get_init_creds_keytab]),)
AC_CHECK_LIB(krb5,krb5_get_max_time_skew,
AC_DEFINE(HAVE_KRB5_GET_MAX_TIME_SKEW,1,
[Define to 1 if you have krb5_get_max_time_skew]),)
AC_CHECK_LIB(krb5,krb5_get_profile,
AC_DEFINE(HAVE_KRB5_GET_PROFILE,1,
[Define to 1 if you have krb5_get_profile]),)
Expand Down
4 changes: 1 addition & 3 deletions src/peer_proxy_negotiate_auth.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,8 @@ int krb5_create_cache(char *kf, char *pn) {
error_message(code));
return (1);
}
#elif HAVE_LIBHEIMDAL_KRB5 && HAVE_KRB5_GET_MAX_TIME_SKEW
#elif HAVE_LIBHEIMDAL_KRB5
skew = krb5_get_max_time_skew(kparam.context);
yadij marked this conversation as resolved.
Show resolved Hide resolved
#elif HAVE_LIBHEIMDAL_KRB5 && HAVE_MAX_SKEW_IN_KRB5_CONTEXT
skew = kparam.context->max_skew;
#else
skew = DEFAULT_SKEW;
#endif
yadij marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading