diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/exec.c | 22 | ||||
| -rw-r--r-- | src/common/restricted_token.c | 2 |
2 files changed, 4 insertions, 20 deletions
diff --git a/src/common/exec.c b/src/common/exec.c index 78bb486f999..773afd080c0 100644 --- a/src/common/exec.c +++ b/src/common/exec.c @@ -435,9 +435,6 @@ set_pglocale_pgservice(const char *argv0, const char *app) { char path[MAXPGPATH]; char my_exec_path[MAXPGPATH]; - char env_path[MAXPGPATH + sizeof("PGSYSCONFDIR=")]; /* longer than - * PGLOCALEDIR */ - char *dup_path; /* don't set LC_ALL in the backend */ if (strcmp(app, PG_TEXTDOMAIN("postgres")) != 0) @@ -462,28 +459,15 @@ set_pglocale_pgservice(const char *argv0, const char *app) get_locale_path(my_exec_path, path); bindtextdomain(app, path); textdomain(app); - - if (getenv("PGLOCALEDIR") == NULL) - { - /* set for libpq to use */ - snprintf(env_path, sizeof(env_path), "PGLOCALEDIR=%s", path); - canonicalize_path(env_path + 12); - dup_path = strdup(env_path); - if (dup_path) - putenv(dup_path); - } + /* set for libpq to use, but don't override existing setting */ + setenv("PGLOCALEDIR", path, 0); #endif if (getenv("PGSYSCONFDIR") == NULL) { get_etc_path(my_exec_path, path); - /* set for libpq to use */ - snprintf(env_path, sizeof(env_path), "PGSYSCONFDIR=%s", path); - canonicalize_path(env_path + 13); - dup_path = strdup(env_path); - if (dup_path) - putenv(dup_path); + setenv("PGSYSCONFDIR", path, 0); } } diff --git a/src/common/restricted_token.c b/src/common/restricted_token.c index dcc88a75c59..9058c5ad252 100644 --- a/src/common/restricted_token.c +++ b/src/common/restricted_token.c @@ -171,7 +171,7 @@ get_restricted_token(void) cmdline = pg_strdup(GetCommandLine()); - putenv("PG_RESTRICT_EXEC=1"); + setenv("PG_RESTRICT_EXEC", "1", 1); if ((restrictedToken = CreateRestrictedProcess(cmdline, &pi)) == 0) { |