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

Commitdf63503

Browse files
committed
Have a go at fixing various outstanding portability issues in code that
was modified for IPv6. Use a robust definition of struct sockaddr_storage,do a proper configure test to see if ss_len exists, don't assume thatgetnameinfo() will handle AF_UNIX sockets, don't trust getaddrinfo toreturn the protocol we ask for, etc. This incorporates several outstandingpatches from Kurt Roeckx, but I'm to blame for anything that doesn'twork ...
1 parent93395de commitdf63503

File tree

15 files changed

+565
-260
lines changed

15 files changed

+565
-260
lines changed

‎config/c-library.m4

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Macros that test various C library quirks
2-
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.22 2003/06/23 23:51:59 momjian Exp $
2+
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.23 2003/07/23 23:30:39 tgl Exp $
33

44

55
# PGAC_VAR_INT_TIMEZONE
@@ -100,8 +100,8 @@ AC_DEFUN([PGAC_STRUCT_SOCKADDR_UN],
100100

101101
# PGAC_STRUCT_SOCKADDR_STORAGE
102102
# ----------------------------
103-
# If `struct sockaddr_storage' exists, define HAVE_STRUCT_SOCKADDR_STORAGE. If
104-
# it is missing then one could define it.
103+
# If `struct sockaddr_storage' exists, define HAVE_STRUCT_SOCKADDR_STORAGE.
104+
#Ifit is missing then one could define it.
105105
AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE],
106106
[AC_CHECK_TYPES([struct sockaddr_storage],[],[],
107107
[#include <sys/types.h>
@@ -110,18 +110,24 @@ AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE],
110110
#endif
111111
])])# PGAC_STRUCT_SOCKADDR_STORAGE
112112

113-
#PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
113+
#PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
114114
# --------------------------------------
115-
# This checks if the struct sockaddr has a proper ss_family and not an
116-
# __ss_family as rfc2553 defined.
117-
AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY],
115+
# Check the members of `struct sockaddr_storage'. We need to know about
116+
# ss_family and ss_len. (Some platforms follow RFC 2553 and call them
117+
# __ss_family and __ss_len.) We also check struct sockaddr's sa_len;
118+
# if we have to define our own `struct sockaddr_storage', this tells us
119+
# whether we need to provide an ss_len field.
120+
AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS],
118121
[AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family,
119-
struct sockaddr_storage.__ss_family],[],[],
122+
struct sockaddr_storage.__ss_family,
123+
struct sockaddr_storage.ss_len,
124+
struct sockaddr_storage.__ss_len,
125+
struct sockaddr.sa_len],[],[],
120126
[#include <sys/types.h>
121127
#ifdef HAVE_SYS_SOCKET_H
122128
#include <sys/socket.h>
123129
#endif
124-
])])#PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
130+
])])#PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
125131

126132

127133
# PGAC_STRUCT_ADDRINFO

‎configure

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9990,6 +9990,186 @@ cat >>confdefs.h <<_ACEOF
99909990
_ACEOF
99919991

99929992

9993+
fi
9994+
echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_len" >&5
9995+
echo $ECHO_N "checking for struct sockaddr_storage.ss_len... $ECHO_C" >&6
9996+
if test "${ac_cv_member_struct_sockaddr_storage_ss_len+set}" = set; then
9997+
echo $ECHO_N "(cached) $ECHO_C" >&6
9998+
else
9999+
cat >conftest.$ac_ext <<_ACEOF
10000+
#line $LINENO "configure"
10001+
#include "confdefs.h"
10002+
#include <sys/types.h>
10003+
#ifdef HAVE_SYS_SOCKET_H
10004+
#include <sys/socket.h>
10005+
#endif
10006+
10007+
10008+
#ifdef F77_DUMMY_MAIN
10009+
# ifdef __cplusplus
10010+
extern "C"
10011+
# endif
10012+
int F77_DUMMY_MAIN() { return 1; }
10013+
#endif
10014+
int
10015+
main ()
10016+
{
10017+
static struct sockaddr_storage ac_aggr;
10018+
if (ac_aggr.ss_len)
10019+
return 0;
10020+
;
10021+
return 0;
10022+
}
10023+
_ACEOF
10024+
rm -f conftest.$ac_objext
10025+
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10026+
(eval $ac_compile) 2>&5
10027+
ac_status=$?
10028+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
10029+
(exit $ac_status); } &&
10030+
{ ac_try='test -s conftest.$ac_objext'
10031+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10032+
(eval $ac_try) 2>&5
10033+
ac_status=$?
10034+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
10035+
(exit $ac_status); }; }; then
10036+
ac_cv_member_struct_sockaddr_storage_ss_len=yes
10037+
else
10038+
echo "$as_me: failed program was:" >&5
10039+
cat conftest.$ac_ext >&5
10040+
ac_cv_member_struct_sockaddr_storage_ss_len=no
10041+
fi
10042+
rm -f conftest.$ac_objext conftest.$ac_ext
10043+
fi
10044+
echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_len" >&5
10045+
echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage_ss_len" >&6
10046+
if test $ac_cv_member_struct_sockaddr_storage_ss_len = yes; then
10047+
10048+
cat >>confdefs.h <<_ACEOF
10049+
#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN 1
10050+
_ACEOF
10051+
10052+
10053+
fi
10054+
echo "$as_me:$LINENO: checking for struct sockaddr_storage.__ss_len" >&5
10055+
echo $ECHO_N "checking for struct sockaddr_storage.__ss_len... $ECHO_C" >&6
10056+
if test "${ac_cv_member_struct_sockaddr_storage___ss_len+set}" = set; then
10057+
echo $ECHO_N "(cached) $ECHO_C" >&6
10058+
else
10059+
cat >conftest.$ac_ext <<_ACEOF
10060+
#line $LINENO "configure"
10061+
#include "confdefs.h"
10062+
#include <sys/types.h>
10063+
#ifdef HAVE_SYS_SOCKET_H
10064+
#include <sys/socket.h>
10065+
#endif
10066+
10067+
10068+
#ifdef F77_DUMMY_MAIN
10069+
# ifdef __cplusplus
10070+
extern "C"
10071+
# endif
10072+
int F77_DUMMY_MAIN() { return 1; }
10073+
#endif
10074+
int
10075+
main ()
10076+
{
10077+
static struct sockaddr_storage ac_aggr;
10078+
if (ac_aggr.__ss_len)
10079+
return 0;
10080+
;
10081+
return 0;
10082+
}
10083+
_ACEOF
10084+
rm -f conftest.$ac_objext
10085+
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10086+
(eval $ac_compile) 2>&5
10087+
ac_status=$?
10088+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
10089+
(exit $ac_status); } &&
10090+
{ ac_try='test -s conftest.$ac_objext'
10091+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10092+
(eval $ac_try) 2>&5
10093+
ac_status=$?
10094+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
10095+
(exit $ac_status); }; }; then
10096+
ac_cv_member_struct_sockaddr_storage___ss_len=yes
10097+
else
10098+
echo "$as_me: failed program was:" >&5
10099+
cat conftest.$ac_ext >&5
10100+
ac_cv_member_struct_sockaddr_storage___ss_len=no
10101+
fi
10102+
rm -f conftest.$ac_objext conftest.$ac_ext
10103+
fi
10104+
echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage___ss_len" >&5
10105+
echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage___ss_len" >&6
10106+
if test $ac_cv_member_struct_sockaddr_storage___ss_len = yes; then
10107+
10108+
cat >>confdefs.h <<_ACEOF
10109+
#define HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN 1
10110+
_ACEOF
10111+
10112+
10113+
fi
10114+
echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
10115+
echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6
10116+
if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
10117+
echo $ECHO_N "(cached) $ECHO_C" >&6
10118+
else
10119+
cat >conftest.$ac_ext <<_ACEOF
10120+
#line $LINENO "configure"
10121+
#include "confdefs.h"
10122+
#include <sys/types.h>
10123+
#ifdef HAVE_SYS_SOCKET_H
10124+
#include <sys/socket.h>
10125+
#endif
10126+
10127+
10128+
#ifdef F77_DUMMY_MAIN
10129+
# ifdef __cplusplus
10130+
extern "C"
10131+
# endif
10132+
int F77_DUMMY_MAIN() { return 1; }
10133+
#endif
10134+
int
10135+
main ()
10136+
{
10137+
static struct sockaddr ac_aggr;
10138+
if (ac_aggr.sa_len)
10139+
return 0;
10140+
;
10141+
return 0;
10142+
}
10143+
_ACEOF
10144+
rm -f conftest.$ac_objext
10145+
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10146+
(eval $ac_compile) 2>&5
10147+
ac_status=$?
10148+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
10149+
(exit $ac_status); } &&
10150+
{ ac_try='test -s conftest.$ac_objext'
10151+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10152+
(eval $ac_try) 2>&5
10153+
ac_status=$?
10154+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
10155+
(exit $ac_status); }; }; then
10156+
ac_cv_member_struct_sockaddr_sa_len=yes
10157+
else
10158+
echo "$as_me: failed program was:" >&5
10159+
cat conftest.$ac_ext >&5
10160+
ac_cv_member_struct_sockaddr_sa_len=no
10161+
fi
10162+
rm -f conftest.$ac_objext conftest.$ac_ext
10163+
fi
10164+
echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
10165+
echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6
10166+
if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
10167+
10168+
cat >>confdefs.h <<_ACEOF
10169+
#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
10170+
_ACEOF
10171+
10172+
999310173
fi
999410174

999510175
echo "$as_me:$LINENO: checking for struct addrinfo" >&5

‎configure.in

Lines changed: 2 additions & 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 $Header: /cvsroot/pgsql/configure.in,v 1.269 2003/07/2317:27:28 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.270 2003/07/2323:30:40 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -778,7 +778,7 @@ PGAC_STRUCT_TIMEZONE
778778
PGAC_UNION_SEMUN
779779
PGAC_STRUCT_SOCKADDR_UN
780780
PGAC_STRUCT_SOCKADDR_STORAGE
781-
PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
781+
PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
782782
PGAC_STRUCT_ADDRINFO
783783

784784
AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [],

‎src/backend/libpq/auth.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.104 2003/07/22 19:00:10 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.105 2003/07/23 23:30:40 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -434,11 +434,10 @@ ClientAuthentication(Port *port)
434434
{
435435
charhostinfo[NI_MAXHOST];
436436

437-
getnameinfo((structsockaddr*)&port->raddr.addr,
438-
port->raddr.salen,
439-
hostinfo,sizeof(hostinfo),
440-
NULL,0,
441-
NI_NUMERICHOST);
437+
getnameinfo_all(&port->raddr.addr,port->raddr.salen,
438+
hostinfo,sizeof(hostinfo),
439+
NULL,0,
440+
NI_NUMERICHOST);
442441

443442
ereport(FATAL,
444443
(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),

0 commit comments

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