Commit1c52f9c

committed

Update Kerberos/GSSAPI configure/meson check

Instead of checking for the much older gss_init_sec_context, check forgss_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 parent2434d60 commit1c52f9cCopy full SHA for 1c52f9c

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1340,8 +1340,8 @@ fi`
`1340`	`1340`
`1341`	`1341`	`if test "$with_gssapi" = yes ; then`
`1342`	`1342`	`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])])`
`1345`	`1345`	`else`
`1346`	`1346`	`LIBS="$LIBS -lgssapi32"`
`1347`	`1347`	`fi`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -634,14 +634,14 @@ if not gssapiopt.disabled()`
`634`	`634`	`endif`
`635`	`635`
`636`	`636`	`ifnot have_gssapi`
`637`		`-elif cc.has_function('gss_init_sec_context',dependencies: gssapi,`
	`637`	`+elif cc.has_function('gss_store_cred_into',dependencies: gssapi,`
`638`	`638`	`args: test_c_args,include_directories: postgres_inc)`
`639`	`639`	`cdata.set('ENABLE_GSS',1)`
`640`	`640`
`641`	`641`	`krb_srvtab='FILE:/@0@/krb5.keytab)'.format(get_option('sysconfdir'))`
`642`	`642`	`cdata.set_quoted('PG_KRB_SRVTAB', krb_srvtab)`
`643`	`643`	`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''')`
`645`	`645`	`else`
`646`	`646`	`have_gssapi=false`
`647`	`647`	`endif`

Comments

(0)