Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit98de86e

Browse files
committed
Remove support for native krb5 authentication
krb5 has been deprecated since 8.3, and the recommended way to doKerberos authentication is using the GSSAPI authentication method(which is still fully supported).libpq retains the ability to identify krb5 authentication, but onlygives an error message about it being unsupported. Since all authenticationis initiated from the backend, there is no need to keep it at allin the backend.
1 parent4b8f285 commit98de86e

File tree

22 files changed

+91
-1142
lines changed

22 files changed

+91
-1142
lines changed

‎configure‎

Lines changed: 1 addition & 313 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,6 @@ with_tclconfig
817817
with_perl
818818
with_python
819819
with_gssapi
820-
with_krb5
821820
with_krb_srvnam
822821
with_pam
823822
with_ldap
@@ -1502,8 +1501,7 @@ Optional Packages:
15021501
--with-perl build Perl modules (PL/Perl)
15031502
--with-python build Python modules (PL/Python)
15041503
--with-gssapi build with GSSAPI support
1505-
--with-krb5 build with Kerberos 5 support
1506-
--with-krb-srvnam=NAME default service principal name in Kerberos
1504+
--with-krb-srvnam=NAME default service principal name in Kerberos (GSSAPI)
15071505
[postgres]
15081506
--with-pam build with PAM support
15091507
--with-ldap build with LDAP support
@@ -5336,43 +5334,6 @@ fi
53365334
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$with_gssapi">&5
53375335
$as_echo"$with_gssapi">&6; }
53385336

5339-
#
5340-
# Kerberos 5
5341-
#
5342-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking whether to build with Kerberos 5 support">&5
5343-
$as_echo_n"checking whether to build with Kerberos 5 support...">&6; }
5344-
5345-
5346-
5347-
# Check whether --with-krb5 was given.
5348-
iftest"${with_krb5+set}" =set;then:
5349-
withval=$with_krb5;
5350-
case$withvalin
5351-
yes)
5352-
5353-
5354-
$as_echo"#define KRB5 1">>confdefs.h
5355-
5356-
krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
5357-
5358-
;;
5359-
no)
5360-
:
5361-
;;
5362-
*)
5363-
as_fn_error$?"no argument expected for --with-krb5 option""$LINENO" 5
5364-
;;
5365-
esac
5366-
5367-
else
5368-
with_krb5=no
5369-
5370-
fi
5371-
5372-
5373-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$with_krb5">&5
5374-
$as_echo"$with_krb5">&6; }
5375-
53765337

53775338

53785339

@@ -8395,186 +8356,6 @@ fi
83958356
fi
83968357
fi
83978358

8398-
iftest"$with_krb5" = yes;then
8399-
iftest"$PORTNAME"!="win32";then
8400-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing com_err">&5
8401-
$as_echo_n"checking for library containing com_err...">&6; }
8402-
if${ac_cv_search_com_err+:}false;then:
8403-
$as_echo_n"(cached)">&6
8404-
else
8405-
ac_func_search_save_LIBS=$LIBS
8406-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
8407-
/* end confdefs.h. */
8408-
8409-
/* Override any GCC internal prototype to avoid an error.
8410-
Use char because int might match the return type of a GCC
8411-
builtin and then its argument prototype would still apply. */
8412-
#ifdef __cplusplus
8413-
extern "C"
8414-
#endif
8415-
char com_err ();
8416-
int
8417-
main ()
8418-
{
8419-
return com_err ();
8420-
;
8421-
return 0;
8422-
}
8423-
_ACEOF
8424-
forac_libin'' krb5'krb5 -lcrypto -ldes -lasn1 -lroken' com_err'com_err -lssl -lcrypto';do
8425-
iftest -z"$ac_lib";then
8426-
ac_res="none required"
8427-
else
8428-
ac_res=-l$ac_lib
8429-
LIBS="-l$ac_lib$ac_func_search_save_LIBS"
8430-
fi
8431-
if ac_fn_c_try_link"$LINENO";then:
8432-
ac_cv_search_com_err=$ac_res
8433-
fi
8434-
rm -f core conftest.err conftest.$ac_objext \
8435-
conftest$ac_exeext
8436-
if${ac_cv_search_com_err+:}false;then:
8437-
break
8438-
fi
8439-
done
8440-
if${ac_cv_search_com_err+:}false;then:
8441-
8442-
else
8443-
ac_cv_search_com_err=no
8444-
fi
8445-
rm conftest.$ac_ext
8446-
LIBS=$ac_func_search_save_LIBS
8447-
fi
8448-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_search_com_err">&5
8449-
$as_echo"$ac_cv_search_com_err">&6; }
8450-
ac_res=$ac_cv_search_com_err
8451-
iftest"$ac_res"!= no;then:
8452-
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
8453-
8454-
else
8455-
as_fn_error$?"could not find function 'com_err' required for Kerberos 5""$LINENO" 5
8456-
fi
8457-
8458-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing krb5_sendauth">&5
8459-
$as_echo_n"checking for library containing krb5_sendauth...">&6; }
8460-
if${ac_cv_search_krb5_sendauth+:}false;then:
8461-
$as_echo_n"(cached)">&6
8462-
else
8463-
ac_func_search_save_LIBS=$LIBS
8464-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
8465-
/* end confdefs.h. */
8466-
8467-
/* Override any GCC internal prototype to avoid an error.
8468-
Use char because int might match the return type of a GCC
8469-
builtin and then its argument prototype would still apply. */
8470-
#ifdef __cplusplus
8471-
extern "C"
8472-
#endif
8473-
char krb5_sendauth ();
8474-
int
8475-
main ()
8476-
{
8477-
return krb5_sendauth ();
8478-
;
8479-
return 0;
8480-
}
8481-
_ACEOF
8482-
forac_libin'' krb5'krb5 -lcrypto -ldes -lasn1 -lroken';do
8483-
iftest -z"$ac_lib";then
8484-
ac_res="none required"
8485-
else
8486-
ac_res=-l$ac_lib
8487-
LIBS="-l$ac_lib$ac_func_search_save_LIBS"
8488-
fi
8489-
if ac_fn_c_try_link"$LINENO";then:
8490-
ac_cv_search_krb5_sendauth=$ac_res
8491-
fi
8492-
rm -f core conftest.err conftest.$ac_objext \
8493-
conftest$ac_exeext
8494-
if${ac_cv_search_krb5_sendauth+:}false;then:
8495-
break
8496-
fi
8497-
done
8498-
if${ac_cv_search_krb5_sendauth+:}false;then:
8499-
8500-
else
8501-
ac_cv_search_krb5_sendauth=no
8502-
fi
8503-
rm conftest.$ac_ext
8504-
LIBS=$ac_func_search_save_LIBS
8505-
fi
8506-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_search_krb5_sendauth">&5
8507-
$as_echo"$ac_cv_search_krb5_sendauth">&6; }
8508-
ac_res=$ac_cv_search_krb5_sendauth
8509-
iftest"$ac_res"!= no;then:
8510-
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
8511-
8512-
else
8513-
as_fn_error$?"could not find function 'krb5_sendauth' required for Kerberos 5""$LINENO" 5
8514-
fi
8515-
8516-
else
8517-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for library containing com_err">&5
8518-
$as_echo_n"checking for library containing com_err...">&6; }
8519-
if${ac_cv_search_com_err+:}false;then:
8520-
$as_echo_n"(cached)">&6
8521-
else
8522-
ac_func_search_save_LIBS=$LIBS
8523-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
8524-
/* end confdefs.h. */
8525-
8526-
/* Override any GCC internal prototype to avoid an error.
8527-
Use char because int might match the return type of a GCC
8528-
builtin and then its argument prototype would still apply. */
8529-
#ifdef __cplusplus
8530-
extern "C"
8531-
#endif
8532-
char com_err ();
8533-
int
8534-
main ()
8535-
{
8536-
return com_err ();
8537-
;
8538-
return 0;
8539-
}
8540-
_ACEOF
8541-
forac_libin'''comerr32 -lkrb5_32';do
8542-
iftest -z"$ac_lib";then
8543-
ac_res="none required"
8544-
else
8545-
ac_res=-l$ac_lib
8546-
LIBS="-l$ac_lib$ac_func_search_save_LIBS"
8547-
fi
8548-
if ac_fn_c_try_link"$LINENO";then:
8549-
ac_cv_search_com_err=$ac_res
8550-
fi
8551-
rm -f core conftest.err conftest.$ac_objext \
8552-
conftest$ac_exeext
8553-
if${ac_cv_search_com_err+:}false;then:
8554-
break
8555-
fi
8556-
done
8557-
if${ac_cv_search_com_err+:}false;then:
8558-
8559-
else
8560-
ac_cv_search_com_err=no
8561-
fi
8562-
rm conftest.$ac_ext
8563-
LIBS=$ac_func_search_save_LIBS
8564-
fi
8565-
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$ac_cv_search_com_err">&5
8566-
$as_echo"$ac_cv_search_com_err">&6; }
8567-
ac_res=$ac_cv_search_com_err
8568-
iftest"$ac_res"!= no;then:
8569-
test"$ac_res" ="none required"|| LIBS="$ac_res$LIBS"
8570-
8571-
else
8572-
as_fn_error$?"could not find function 'com_err' required for Kerberos 5""$LINENO" 5
8573-
fi
8574-
8575-
fi
8576-
fi
8577-
85788359
iftest"$with_openssl" = yes;then
85798360
iftest"$PORTNAME"!="win32";then
85808361
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto">&5
@@ -9494,17 +9275,6 @@ fi
94949275

94959276
done
94969277

9497-
fi
9498-
9499-
iftest"$with_krb5" = yes;then
9500-
ac_fn_c_check_header_mongrel"$LINENO""krb5.h""ac_cv_header_krb5_h""$ac_includes_default"
9501-
iftest"x$ac_cv_header_krb5_h" = xyes;then:
9502-
9503-
else
9504-
as_fn_error$?"header file <krb5.h> is required for Kerberos 5""$LINENO" 5
9505-
fi
9506-
9507-
95089278
fi
95099279

95109280
iftest"$with_openssl" = yes;then
@@ -10772,88 +10542,6 @@ fi
1077210542

1077310543
fi
1077410544

10775-
iftest"$with_krb5" = yes;then
10776-
# Check for differences between MIT and Heimdal (KTH) releases
10777-
ac_fn_c_check_member"$LINENO""krb5_ticket""enc_part2""ac_cv_member_krb5_ticket_enc_part2""#include <krb5.h>
10778-
"
10779-
iftest"x$ac_cv_member_krb5_ticket_enc_part2" = xyes;then:
10780-
10781-
cat>>confdefs.h<<_ACEOF
10782-
#define HAVE_KRB5_TICKET_ENC_PART2 1
10783-
_ACEOF
10784-
10785-
10786-
else
10787-
ac_fn_c_check_member"$LINENO""krb5_ticket""client""ac_cv_member_krb5_ticket_client""#include <krb5.h>
10788-
"
10789-
iftest"x$ac_cv_member_krb5_ticket_client" = xyes;then:
10790-
10791-
cat>>confdefs.h<<_ACEOF
10792-
#define HAVE_KRB5_TICKET_CLIENT 1
10793-
_ACEOF
10794-
10795-
10796-
else
10797-
as_fn_error$?"could not determine how to get client name from Kerberos 5 ticket""$LINENO" 5
10798-
fi
10799-
10800-
fi
10801-
10802-
ac_fn_c_check_member"$LINENO""krb5_error""text.data""ac_cv_member_krb5_error_text_data""#include <krb5.h>
10803-
"
10804-
iftest"x$ac_cv_member_krb5_error_text_data" = xyes;then:
10805-
10806-
cat>>confdefs.h<<_ACEOF
10807-
#define HAVE_KRB5_ERROR_TEXT_DATA 1
10808-
_ACEOF
10809-
10810-
10811-
else
10812-
ac_fn_c_check_member"$LINENO""krb5_error""e_data""ac_cv_member_krb5_error_e_data""#include <krb5.h>
10813-
"
10814-
iftest"x$ac_cv_member_krb5_error_e_data" = xyes;then:
10815-
10816-
cat>>confdefs.h<<_ACEOF
10817-
#define HAVE_KRB5_ERROR_E_DATA 1
10818-
_ACEOF
10819-
10820-
10821-
else
10822-
as_fn_error$?"could not determine how to extract Kerberos 5 error messages""$LINENO" 5
10823-
fi
10824-
10825-
fi
10826-
10827-
10828-
# Win32 requires headers to be loaded for __stdcall, so can't use
10829-
# AC_CHECK_FUNCS here.
10830-
{$as_echo"$as_me:${as_lineno-$LINENO}: checking for krb5_free_unparsed_name">&5
10831-
$as_echo_n"checking for krb5_free_unparsed_name...">&6; }
10832-
cat confdefs.h -<<_ACEOF >conftest.$ac_ext
10833-
/* end confdefs.h. */
10834-
#include <krb5.h>
10835-
int
10836-
main ()
10837-
{
10838-
krb5_free_unparsed_name(NULL,NULL);
10839-
;
10840-
return 0;
10841-
}
10842-
_ACEOF
10843-
if ac_fn_c_try_link"$LINENO";then:
10844-
10845-
$as_echo"#define HAVE_KRB5_FREE_UNPARSED_NAME 1">>confdefs.h
10846-
10847-
{$as_echo"$as_me:${as_lineno-$LINENO}: result: yes">&5
10848-
$as_echo"yes">&6; }
10849-
else
10850-
{$as_echo"$as_me:${as_lineno-$LINENO}: result: no">&5
10851-
$as_echo"no">&6; }
10852-
fi
10853-
rm -f core conftest.err conftest.$ac_objext \
10854-
conftest$ac_exeext conftest.$ac_ext
10855-
fi
10856-
1085710545
# On PPC, check if assembler supports LWARX instruction's mutex hint bit
1085810546
case$host_cpuin
1085910547
ppc*|powerpc*)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp