postgres.git / summary / log / commit / refs
commit 1c52f9c042fb939ed55ff572daee71036720db57
Author: Stephen Frost <sfrost@snowman.net>
Date: Mon Apr 17 13:51:04 2023 +0000
First released in: 16.0
Update Kerberos/GSSAPI configure/meson check
Instead of checking for the much older gss_init_sec_context, check for
gss_store_cred_into which was added in MIT Kerberos 1.11 (circa 2012).
Discussion: https://postgr.es/m/2313469.1681695223%40sss.pgh.pa.us
configure.ac | 4 ++--
meson.build | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index c53a9c788e8..1362f57a27c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1340,8 +1340,8 @@ fi
if test "$with_gssapi" = yes ; then
if test "$PORTNAME" != "win32"; then
- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
+ AC_SEARCH_LIBS(gss_store_cred_into, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
+ [AC_MSG_ERROR([could not find function 'gss_store_cred_into' required for GSSAPI])])
else
LIBS="$LIBS -lgssapi32"
fi
diff --git a/meson.build b/meson.build
index 3405cc07eed..f1db5455b05 100644
--- a/meson.build
+++ b/meson.build
@@ -634,14 +634,14 @@ if not gssapiopt.disabled()
endif
if not have_gssapi
- elif cc.has_function('gss_init_sec_context', dependencies: gssapi,
+ elif cc.has_function('gss_store_cred_into', dependencies: gssapi,
args: test_c_args, include_directories: postgres_inc)
cdata.set('ENABLE_GSS', 1)
krb_srvtab = 'FILE:/@0@/krb5.keytab)'.format(get_option('sysconfdir'))
cdata.set_quoted('PG_KRB_SRVTAB', krb_srvtab)
elif gssapiopt.enabled()
- error('''could not find function 'gss_init_sec_context' required for GSSAPI''')
+ error('''could not find function 'gss_store_cred_into' required for GSSAPI''')
else
have_gssapi = false
endif
[parent: 2434d60a2ae9]