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

Commitda59a70

Browse files
committed
Remove direct inclusions of <com_err.h> as well as configure test for
its presence. This amounts to desupporting Kerberos 5 releases 1.0.*,which is small loss, and simplifies use of our Kerberos code on platformswith Red-Hat-style include file layouts. Per gripe from John Gray andfollowup discussion.
1 parent59bffa3 commitda59a70

File tree

4 files changed

+3
-116
lines changed

4 files changed

+3
-116
lines changed

‎configure

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -9098,116 +9098,6 @@ echo "$as_me: error: header file <krb5.h> is required for Kerberos 5" >&2;}
90989098
fi
90999099

91009100

9101-
if test "${ac_cv_header_com_err_h+set}" = set; then
9102-
echo "$as_me:$LINENO: checking for com_err.h" >&5
9103-
echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
9104-
if test "${ac_cv_header_com_err_h+set}" = set; then
9105-
echo $ECHO_N "(cached) $ECHO_C" >&6
9106-
fi
9107-
echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
9108-
echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
9109-
else
9110-
# Is the header compilable?
9111-
echo "$as_me:$LINENO: checking com_err.h usability" >&5
9112-
echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6
9113-
cat >conftest.$ac_ext <<_ACEOF
9114-
#line $LINENO "configure"
9115-
#include "confdefs.h"
9116-
$ac_includes_default
9117-
#include <com_err.h>
9118-
_ACEOF
9119-
rm -f conftest.$ac_objext
9120-
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9121-
(eval $ac_compile) 2>&5
9122-
ac_status=$?
9123-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
9124-
(exit $ac_status); } &&
9125-
{ ac_try='test -s conftest.$ac_objext'
9126-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9127-
(eval $ac_try) 2>&5
9128-
ac_status=$?
9129-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
9130-
(exit $ac_status); }; }; then
9131-
ac_header_compiler=yes
9132-
else
9133-
echo "$as_me: failed program was:" >&5
9134-
cat conftest.$ac_ext >&5
9135-
ac_header_compiler=no
9136-
fi
9137-
rm -f conftest.$ac_objext conftest.$ac_ext
9138-
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
9139-
echo "${ECHO_T}$ac_header_compiler" >&6
9140-
9141-
# Is the header present?
9142-
echo "$as_me:$LINENO: checking com_err.h presence" >&5
9143-
echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6
9144-
cat >conftest.$ac_ext <<_ACEOF
9145-
#line $LINENO "configure"
9146-
#include "confdefs.h"
9147-
#include <com_err.h>
9148-
_ACEOF
9149-
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
9150-
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9151-
ac_status=$?
9152-
egrep -v '^ *\+' conftest.er1 >conftest.err
9153-
rm -f conftest.er1
9154-
cat conftest.err >&5
9155-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
9156-
(exit $ac_status); } >/dev/null; then
9157-
if test -s conftest.err; then
9158-
ac_cpp_err=$ac_c_preproc_warn_flag
9159-
else
9160-
ac_cpp_err=
9161-
fi
9162-
else
9163-
ac_cpp_err=yes
9164-
fi
9165-
if test -z "$ac_cpp_err"; then
9166-
ac_header_preproc=yes
9167-
else
9168-
echo "$as_me: failed program was:" >&5
9169-
cat conftest.$ac_ext >&5
9170-
ac_header_preproc=no
9171-
fi
9172-
rm -f conftest.err conftest.$ac_ext
9173-
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
9174-
echo "${ECHO_T}$ac_header_preproc" >&6
9175-
9176-
# So? What about this header?
9177-
case $ac_header_compiler:$ac_header_preproc in
9178-
yes:no )
9179-
{ echo "$as_me:$LINENO: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
9180-
echo "$as_me: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
9181-
{ echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
9182-
echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;};;
9183-
no:yes )
9184-
{ echo "$as_me:$LINENO: WARNING: com_err.h: present but cannot be compiled" >&5
9185-
echo "$as_me: WARNING: com_err.h: present but cannot be compiled" >&2;}
9186-
{ echo "$as_me:$LINENO: WARNING: com_err.h: check for missing prerequisite headers?" >&5
9187-
echo "$as_me: WARNING: com_err.h: check for missing prerequisite headers?" >&2;}
9188-
{ echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
9189-
echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;};;
9190-
esac
9191-
echo "$as_me:$LINENO: checking for com_err.h" >&5
9192-
echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
9193-
if test "${ac_cv_header_com_err_h+set}" = set; then
9194-
echo $ECHO_N "(cached) $ECHO_C" >&6
9195-
else
9196-
ac_cv_header_com_err_h=$ac_header_preproc
9197-
fi
9198-
echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
9199-
echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
9200-
9201-
fi
9202-
if test $ac_cv_header_com_err_h = yes; then
9203-
:
9204-
else
9205-
{ { echo "$as_me:$LINENO: error: header file <com_err.h> is required for Kerberos 5" >&5
9206-
echo "$as_me: error: header file <com_err.h> is required for Kerberos 5" >&2;}
9207-
{ (exit 1); exit 1; }; }
9208-
fi
9209-
9210-
92119101
fi
92129102

92139103
if test "$with_openssl" = yes ; then

‎configure.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.391 2004/12/16 20:40:59 tgl Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.392 2004/12/20 17:13:39 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -763,7 +763,6 @@ fi
763763

764764
if test "$with_krb5" = yes ; then
765765
AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([header file <krb5.h> is required for Kerberos 5])])
766-
AC_CHECK_HEADER(com_err.h, [], [AC_MSG_ERROR([header file <com_err.h> is required for Kerberos 5])])
767766
fi
768767

769768
if test "$with_openssl" = yes ; then

‎src/backend/libpq/auth.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.119 2004/10/12 21:54:38 petere Exp $
11+
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.120 2004/12/20 17:13:40 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -150,7 +150,6 @@ pg_krb4_recvauth(Port *port)
150150
*/
151151

152152
#include<krb5.h>
153-
#include<com_err.h>
154153

155154
/*
156155
* pg_an_to_ln -- return the local name corresponding to an authentication

‎src/interfaces/libpq/fe-auth.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.95 2004/11/09 15:57:57 petere Exp $
13+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.96 2004/12/20 17:13:41 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -243,7 +243,6 @@ pg_krb4_sendauth(char *PQerrormsg, int sock,
243243
*/
244244

245245
#include<krb5.h>
246-
#include<com_err.h>
247246

248247
/*
249248
* pg_an_to_ln -- return the local name corresponding to an authentication

0 commit comments

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