diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/port/thread.c | 58 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 1 |
3 files changed, 4 insertions, 58 deletions
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index bf42c541dc4..f9618e19863 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -240,9 +240,6 @@ /* Define to 1 if you have the `getpeerucred' function. */ #undef HAVE_GETPEERUCRED -/* Define to 1 if you have the `getpwuid_r' function. */ -#undef HAVE_GETPWUID_R - /* Define to 1 if you have the `getrlimit' function. */ #undef HAVE_GETRLIMIT diff --git a/src/port/thread.c b/src/port/thread.c index 23c3fbdf864..492e5a3b72d 100644 --- a/src/port/thread.c +++ b/src/port/thread.c @@ -18,63 +18,13 @@ /* - * Threading sometimes requires specially-named versions of functions - * that return data in static buffers, like strerror_r() instead of - * strerror(). Other operating systems use pthread_setspecific() - * and pthread_getspecific() internally to allow standard library - * functions to return static data to threaded applications. And some - * operating systems have neither. - * - * Additional confusion exists because many operating systems that - * use pthread_setspecific/pthread_getspecific() also have *_r versions - * of standard library functions for compatibility with operating systems - * that require them. However, internally, these *_r functions merely - * call the thread-safe standard library functions. - * - * For example, BSD/OS 4.3 uses Bind 8.2.3 for getpwuid(). Internally, - * getpwuid() calls pthread_setspecific/pthread_getspecific() to return - * static data to the caller in a thread-safe manner. However, BSD/OS - * also has getpwuid_r(), which merely calls getpwuid() and shifts - * around the arguments to match the getpwuid_r() function declaration. - * Therefore, while BSD/OS has getpwuid_r(), it isn't required. It also - * doesn't have strerror_r(), so we can't fall back to only using *_r - * functions for threaded programs. - * - * The current setup is to try threading in this order: - * - * use *_r function names if they exit - * (*_THREADSAFE=yes) - * use non-*_r functions if they are thread-safe + * Historically, the code in this module had to deal with operating systems + * that lacked getpwuid_r(). */ #ifndef WIN32 /* - * Wrapper around getpwuid() or getpwuid_r() to mimic POSIX getpwuid_r() - * behaviour, if that function is not available or required. - * - * Per POSIX, the possible cases are: - * success: returns zero, *result is non-NULL - * uid not found: returns zero, *result is NULL - * error during lookup: returns an errno code, *result is NULL - * (caller should *not* assume that the errno variable is set) - */ -static int -pqGetpwuid(uid_t uid, struct passwd *resultbuf, char *buffer, - size_t buflen, struct passwd **result) -{ -#if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(HAVE_GETPWUID_R) - return getpwuid_r(uid, resultbuf, buffer, buflen, result); -#else - /* no getpwuid_r() available, just use getpwuid() */ - errno = 0; - *result = getpwuid(uid); - /* paranoia: ensure we return zero on success */ - return (*result == NULL) ? errno : 0; -#endif -} - -/* * pg_get_user_name - get the name of the user with the given ID * * On success, the user name is returned into the buffer (of size buflen), @@ -89,7 +39,7 @@ pg_get_user_name(uid_t user_id, char *buffer, size_t buflen) struct passwd *pw = NULL; int pwerr; - pwerr = pqGetpwuid(user_id, &pwdstr, pwdbuf, sizeof(pwdbuf), &pw); + pwerr = getpwuid_r(user_id, &pwdstr, pwdbuf, sizeof(pwdbuf), &pw); if (pw != NULL) { strlcpy(buffer, pw->pw_name, buflen); @@ -125,7 +75,7 @@ pg_get_user_home_dir(uid_t user_id, char *buffer, size_t buflen) struct passwd *pw = NULL; int pwerr; - pwerr = pqGetpwuid(user_id, &pwdstr, pwdbuf, sizeof(pwdbuf), &pw); + pwerr = getpwuid_r(user_id, &pwdstr, pwdbuf, sizeof(pwdbuf), &pw); if (pw != NULL) { strlcpy(buffer, pw->pw_dir, buflen); diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index a71a24d435d..b09872e018d 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -274,7 +274,6 @@ sub GenerateFiles HAVE_GETOPT_LONG => undef, HAVE_GETPEEREID => undef, HAVE_GETPEERUCRED => undef, - HAVE_GETPWUID_R => undef, HAVE_GETRLIMIT => undef, HAVE_GETTIMEOFDAY => undef, HAVE_GSSAPI_GSSAPI_H => undef, |