Index: configure
===================================================================
RCS file: /cvsroot/pgsql-server/configure,v
retrieving revision 1.331
diff -c -c -r1.331 configure
*** configure	9 Mar 2004 22:40:09 -0000	1.331
--- configure	20 Mar 2004 14:51:42 -0000
***************
*** 13247,13252 ****
--- 13247,13311 ----
  #define GETPWUID_THREADSAFE 1
  _ACEOF
  
+ else	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
  if test "$enable_thread_safety" = yes -a "$GETHOSTBYNAME_THREADSAFE" = yes ; then
  
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql-server/configure.in,v
retrieving revision 1.319
diff -c -c -r1.319 configure.in
*** configure.in	9 Mar 2004 22:40:10 -0000	1.319
--- configure.in	20 Mar 2004 14:51:43 -0000
***************
*** 999,1004 ****
--- 999,1005 ----
  fi
  if test "$enable_thread_safety" = yes -a "$GETPWUID_THREADSAFE" = yes ; then
  AC_DEFINE(GETPWUID_THREADSAFE, 1, [Define if getpwuid is not thread safe])
+ else	PGAC_FUNC_GETPWUID_R_5ARG
  fi
  if test "$enable_thread_safety" = yes -a "$GETHOSTBYNAME_THREADSAFE" = yes ; then
  AC_DEFINE(GETHOSTBYNAME_THREADSAFE, 1, [Define if gethostbyname is not thread safe])
Index: config/c-library.m4
===================================================================
RCS file: /cvsroot/pgsql-server/config/c-library.m4,v
retrieving revision 1.24
diff -c -c -r1.24 c-library.m4
*** config/c-library.m4	29 Nov 2003 19:51:17 -0000	1.24
--- config/c-library.m4	20 Mar 2004 14:51:43 -0000
***************
*** 73,78 ****
--- 73,101 ----
  ])# 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.
Index: src/include/pg_config.h.in
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/pg_config.h.in,v
retrieving revision 1.68
diff -c -c -r1.68 pg_config.h.in
*** src/include/pg_config.h.in	11 Feb 2004 21:44:04 -0000	1.68
--- src/include/pg_config.h.in	20 Mar 2004 14:51:45 -0000
***************
*** 46,51 ****
--- 46,54 ----
  /* Define if gethostbyname is not thread safe */
  #undef GETHOSTBYNAME_THREADSAFE
  
+ /* Define to 1 if getpwuid_r() takes a 5th argument. */
+ #undef GETPWUID_R_5ARG
+ 
  /* Define if getpwuid is not thread safe */
  #undef GETPWUID_THREADSAFE
  
Index: src/port/thread.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/port/thread.c,v
retrieving revision 1.17
diff -c -c -r1.17 thread.c
*** src/port/thread.c	14 Mar 2004 14:01:43 -0000	1.17
--- src/port/thread.c	20 Mar 2004 14:51:46 -0000
***************
*** 97,109 ****
  		   size_t buflen, struct passwd **result)
  {
  #if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(HAVE_GETPWUID_R)
  	/*
  	 * 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);
  
  #else
  
--- 97,113 ----
  		   size_t buflen, struct passwd **result)
  {
  #if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && 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)
  	 */
! 	result = getpwuid_r(uid, resultbuf, buffer, buflen);
! #endif
  
  #else