mirror of https://github.com/postgres/postgres
Handle draft version of getpwuid_r() that accepts only four arguments.
Backpatch to 7.4.X. Required for Solaris 7 & 8.
This commit is contained in:
Bruce Momjian
parent
774571fd08
commit
21a7569b1a
|
|
@ -1,5 +1,5 @@
|
|||
# Macros that test various C library quirks
|
||||
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.23 2003/07/23 23:30:39 tgl Exp $
|
||||
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.23.4.1 2004/03/20 15:39:40 momjian Exp $
|
||||
|
||||
|
||||
# PGAC_VAR_INT_TIMEZONE
|
||||
|
|
@ -73,6 +73,29 @@ AH_VERBATIM(GETTIMEOFDAY_1ARG_,
|
|||
])# PGAC_FUNC_GETTIMEOFDAY_1ARG
|
||||
|
||||
|
||||
# PGAC_FUNC_GETPWUID_R_5ARG
|
||||
# ---------------------------
|
||||
# Check if getpwuid_r() takes a fifth argument (later POSIX standard, not draft version)
|
||||
# If so, define GETPWUID_R_5ARG
|
||||
AC_DEFUN([PGAC_FUNC_GETPWUID_R_5ARG],
|
||||
[AC_CACHE_CHECK(whether getpwuid_r takes a fifth argument,
|
||||
pgac_func_getpwuid_r_5arg,
|
||||
[AC_TRY_COMPILE([#include <sys/types.h>
|
||||
#include <pwd.h>],
|
||||
[uid_t uid;
|
||||
struct passwd *space;
|
||||
char *buf;
|
||||
size_t bufsize;
|
||||
struct passwd **result;
|
||||
getpwuid_r(uid, space, buf, bufsize, result);],
|
||||
[pgac_func_getpwuid_r_5arg=yes],
|
||||
[pgac_func_getpwuid_r_5arg=no])])
|
||||
if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
|
||||
AC_DEFINE(GETPWUID_R_5ARG,, [Define to 1 if getpwuid_r() takes a 5th argument.])
|
||||
fi
|
||||
])# PGAC_FUNC_GETPWUID_R_5ARG
|
||||
|
||||
|
||||
# PGAC_UNION_SEMUN
|
||||
# ----------------
|
||||
# Check if `union semun' exists. Define HAVE_UNION_SEMUN if so.
|
||||
|
|
|
|||
|
|
@ -13484,6 +13484,65 @@ done
|
|||
|
||||
CFLAGS="$_CFLAGS"
|
||||
LIBS="$_LIBS"
|
||||
echo "$as_me:$LINENO: checking whether getpwuid_r takes a fifth argument" >&5
|
||||
echo $ECHO_N "checking whether getpwuid_r takes a fifth argument... $ECHO_C" >&6
|
||||
if test "${pgac_func_getpwuid_r_5arg+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <pwd.h>
|
||||
#ifdef F77_DUMMY_MAIN
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
int F77_DUMMY_MAIN() { return 1; }
|
||||
#endif
|
||||
int
|
||||
main ()
|
||||
{
|
||||
uid_t uid;
|
||||
struct passwd *space;
|
||||
char *buf;
|
||||
size_t bufsize;
|
||||
struct passwd **result;
|
||||
getpwuid_r(uid, space, buf, bufsize, result);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
pgac_func_getpwuid_r_5arg=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
pgac_func_getpwuid_r_5arg=no
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $pgac_func_getpwuid_r_5arg" >&5
|
||||
echo "${ECHO_T}$pgac_func_getpwuid_r_5arg" >&6
|
||||
if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define GETPWUID_R_5ARG
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl $Header: /cvsroot/pgsql/configure.in,v 1.301.2.6 2004/03/05 19:57:20 momjian Exp $
|
||||
dnl $Header: /cvsroot/pgsql/configure.in,v 1.301.2.7 2004/03/20 15:39:40 momjian Exp $
|
||||
dnl
|
||||
dnl Developers, please strive to achieve this order:
|
||||
dnl
|
||||
|
|
@ -1061,6 +1061,7 @@ LIBS="$LIBS $THREAD_LIBS"
|
|||
AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r])
|
||||
CFLAGS="$_CFLAGS"
|
||||
LIBS="$_LIBS"
|
||||
PGAC_FUNC_GETPWUID_R_5ARG
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,9 @@
|
|||
(--enable-thread-safety) */
|
||||
#undef ENABLE_THREAD_SAFETY
|
||||
|
||||
/* Define to 1 if getpwuid_r() takes a 5th argument. */
|
||||
#undef GETPWUID_R_5ARG
|
||||
|
||||
/* Define to 1 if gettimeofday() takes only 1 argument. */
|
||||
#undef GETTIMEOFDAY_1ARG
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
|
||||
*
|
||||
* $Id: thread.c,v 1.12.2.3 2004/03/14 14:01:54 momjian Exp $
|
||||
* $Id: thread.c,v 1.12.2.4 2004/03/20 15:39:40 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
|
@ -107,14 +107,17 @@ pqGetpwuid(uid_t uid, struct passwd *resultbuf, char *buffer,
|
|||
size_t buflen, struct passwd **result)
|
||||
{
|
||||
#if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(NEED_REENTRANT_FUNCS) && defined(HAVE_GETPWUID_R)
|
||||
|
||||
#ifdef GETPWUID_R_5ARG
|
||||
/* POSIX version */
|
||||
getpwuid_r(uid, resultbuf, buffer, buflen, result);
|
||||
#else
|
||||
/*
|
||||
* Early POSIX draft of getpwuid_r() returns 'struct passwd *'.
|
||||
* getpwuid_r(uid, resultbuf, buffer, buflen)
|
||||
* Do we need to support it? bjm 2003-08-14
|
||||
*/
|
||||
/* POSIX version */
|
||||
getpwuid_r(uid, resultbuf, buffer, buflen, result);
|
||||
|
||||
result = getpwuid_r(uid, resultbuf, buffer, buflen);
|
||||
#endif
|
||||
#else
|
||||
|
||||
#if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(NEED_REENTRANT_FUNCS) && !defined(HAVE_GETPWUID_R)
|
||||
|
|
|
|||
Loading…
Reference in New Issue