Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1c52f9c

Browse files
committed
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
1 parent 2434d60 commit 1c52f9c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1340,8 +1340,8 @@ fi
13401340

13411341
if test "$with_gssapi" = yes ; then
13421342
if test "$PORTNAME" != "win32"; then
1343-
AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
1344-
[AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
1343+
AC_SEARCH_LIBS(gss_store_cred_into, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
1344+
[AC_MSG_ERROR([could not find function 'gss_store_cred_into' required for GSSAPI])])
13451345
else
13461346
LIBS="$LIBS -lgssapi32"
13471347
fi

meson.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -634,14 +634,14 @@ if not gssapiopt.disabled()
634634
endif
635635

636636
if not have_gssapi
637-
elif cc.has_function('gss_init_sec_context', dependencies: gssapi,
637+
elif cc.has_function('gss_store_cred_into', dependencies: gssapi,
638638
args: test_c_args, include_directories: postgres_inc)
639639
cdata.set('ENABLE_GSS', 1)
640640

641641
krb_srvtab = 'FILE:/@0@/krb5.keytab)'.format(get_option('sysconfdir'))
642642
cdata.set_quoted('PG_KRB_SRVTAB', krb_srvtab)
643643
elif gssapiopt.enabled()
644-
error('''could not find function 'gss_init_sec_context' required for GSSAPI''')
644+
error('''could not find function 'gss_store_cred_into' required for GSSAPI''')
645645
else
646646
have_gssapi = false
647647
endif

0 commit comments

Comments
 (0)