From 8afe005f424e43e783a0220a863099a0f1037052 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 8 Jan 2005 22:51:15 +0000 Subject: [PATCH] Consistently use geteuid() not getuid(); there were a few places deviating from our long-established standard. --- contrib/mSQL-interface/mpgsql.c | 5 +++-- src/backend/libpq/be-secure.c | 4 ++-- src/bin/initdb/initdb.c | 6 +++--- src/bin/psql/help.c | 4 ++-- src/bin/scripts/common.c | 4 ++-- src/interfaces/libpq/fe-secure.c | 7 ++----- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/contrib/mSQL-interface/mpgsql.c b/contrib/mSQL-interface/mpgsql.c index 3957c11dd2..cd3daba337 100644 --- a/contrib/mSQL-interface/mpgsql.c +++ b/contrib/mSQL-interface/mpgsql.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "msql.h" #include "libpq-fe.h" @@ -264,7 +265,7 @@ msqlListTables(int a) snprintf(tbuf, BUFSIZ, "select relname from pg_class where relkind='r' and relowner=%d", - getuid()); + geteuid()); if (msqlQuery(a, tbuf) > 0) { m = msqlStoreResult(); @@ -288,7 +289,7 @@ msqlListIndex(int a, char *b, char *c) snprintf(tbuf, BUFSIZ, "select relname from pg_class where relkind='i' and relowner=%d", - getuid()); + geteuid()); if (msqlQuery(a, tbuf) > 0) { m = msqlStoreResult(); diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index 8ab152d4c2..f5657efae5 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.55 2004/12/31 21:59:50 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.56 2005/01/08 22:51:12 tgl Exp $ * * Since the server static private key ($DataDir/server.key) * will normally be stored unencrypted so that the database @@ -676,7 +676,7 @@ initialize_SSL(void) */ #if !defined(WIN32) && !defined(__CYGWIN__) if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IRWXG | S_IRWXO)) || - buf.st_uid != getuid()) + buf.st_uid != geteuid()) ereport(FATAL, (errcode(ERRCODE_CONFIG_FILE_ERROR), errmsg("unsafe permissions on private key file \"%s\"", diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index d85944ebfc..2d3958b5a1 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -39,7 +39,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * Portions taken from FreeBSD. * - * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.72 2004/12/31 22:02:59 pgsql Exp $ + * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.73 2005/01/08 22:51:12 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -628,11 +628,11 @@ get_id(void) struct passwd *pw; - pw = getpwuid(getuid()); + pw = getpwuid(geteuid()); #ifndef __BEOS__ /* no root check on BEOS */ - if (!geteuid()) /* 0 is root's uid */ + if (geteuid() == 0) /* 0 is root's uid */ { fprintf(stderr, _("%s: cannot be run as root\n" diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 2033a4bd86..1012de57d3 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.99 2005/01/01 05:43:08 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.100 2005/01/08 22:51:13 tgl Exp $ */ #include "postgres_fe.h" #include "common.h" @@ -19,7 +19,7 @@ #include /* for getpwuid() */ #endif #include /* (ditto) */ -#include /* for getuid() */ +#include /* for geteuid() */ #else #include #endif diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c index d11ebfd644..c84617b3ed 100644 --- a/src/bin/scripts/common.c +++ b/src/bin/scripts/common.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.15 2004/12/31 22:03:17 pgsql Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.16 2005/01/08 22:51:14 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ get_user_name(const char *progname) #ifndef WIN32 struct passwd *pw; - pw = getpwuid(getuid()); + pw = getpwuid(geteuid()); if (!pw) { fprintf(stderr, _("%s: could not obtain information about current user: %s\n"), diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index b4c24754aa..0f9a8fec60 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.65 2005/01/06 21:41:44 tgl Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.66 2005/01/08 22:51:15 tgl Exp $ * * NOTES * [ Most of these notes are wrong/obsolete, but perhaps not all ] @@ -79,12 +79,9 @@ #include "postgres_fe.h" -#include #include #include -#include #include -#include #include "libpq-fe.h" #include "libpq-int.h" @@ -819,7 +816,7 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey) } #ifndef WIN32 if (!S_ISREG(buf.st_mode) || (buf.st_mode & 0077) || - buf.st_uid != getuid()) + buf.st_uid != geteuid()) { printfPQExpBuffer(&conn->errorMessage, libpq_gettext("private key file \"%s\" has wrong permissions\n"), -- 2.11.0