summaryrefslogtreecommitdiff
path: root/src/include/utils
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2004-11-24 19:51:05 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2004-11-24 19:51:05 +0000
commitcf796cc702a879947fd6d1290e25250fe0b37d69 (patch)
tree5730f3eadbcea0e8442898ec84e96b4a884ccdb6 /src/include/utils
parent5597fee8d701bc8f3cb859ff935699ef6ce08b31 (diff)
downloadpostgresql-cf796cc702a879947fd6d1290e25250fe0b37d69.tar.gz
A client_encoding specification coming from the connection request has
to be processed by GUC before InitPostgres, because any required lookup of the encoding conversion function has to be done during InitializeClientEncoding. So, I broke this last week by moving GUC processing to after InitPostgres :-(. What we can do as a compromise is process non-SUSET variables during command line scanning (the same as before), and postpone the processing of only SUSET variables. None of the SUSET variables need to be set before InitPostgres.
Diffstat (limited to 'src/include/utils')
-rw-r--r--src/include/utils/guc.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index f5f4a78fe4..786d696620 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -7,7 +7,7 @@
* Copyright (c) 2000-2004, PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
- * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.56 2004/11/14 19:35:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.57 2004/11/24 19:51:05 tgl Exp $
*--------------------------------------------------------------------
*/
#ifndef GUC_H
@@ -44,9 +44,7 @@
* given backend once it's started, but they can vary across backends.
*
* SUSET options can be set at postmaster startup, with the SIGHUP
- * mechanism, or from SQL if you're a superuser. These options cannot
- * be set in the connection startup packet, because when it is processed
- * we don't yet know if the user is a superuser.
+ * mechanism, or from SQL if you're a superuser.
*
* USERSET options can be set by anyone any time.
*/
@@ -177,6 +175,7 @@ extern void EmitWarningsOnPlaceholders(const char *className);
extern const char *GetConfigOption(const char *name);
extern const char *GetConfigOptionResetString(const char *name);
+extern bool IsSuperuserConfigOption(const char *name);
extern void ProcessConfigFile(GucContext context);
extern void InitializeGUCOptions(void);
extern bool SelectConfigFiles(const char *userDoption, const char *progname);