mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix another oversight in logging of changes in postgresql.conf settings.

Browse Source 
We were using GetConfigOption to collect the old value of each setting,
overlooking the possibility that it didn't exist yet.  This does happen
in the case of adding a new entry within a custom variable class, as
exhibited in bug #6097 from Maxim Boguk.

To fix, add a missing_ok parameter to GetConfigOption, but only in 9.1
and HEAD --- it seems possible that some third-party code is using that
function, so changing its API in a minor release would cause problems.
In 9.0, create a near-duplicate function instead.
This commit is contained in:
Tom Lane 2011-07-08 17:02:58 -04:00
parent 89fd72cbf2
commit 9d522cb35d
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/commands/extension.c
View File

@ -814,14 +814,14 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
* error.
*/
save_client_min_messages =
pstrdup(GetConfigOption("client_min_messages", false));
pstrdup(GetConfigOption("client_min_messages", false, false));
if (client_min_messages < WARNING)
(void) set_config_option("client_min_messages", "warning",
PGC_USERSET, PGC_S_SESSION,
GUC_ACTION_LOCAL, true);
save_log_min_messages =
pstrdup(GetConfigOption("log_min_messages", false));
pstrdup(GetConfigOption("log_min_messages", false, false));
if (log_min_messages < WARNING)
(void) set_config_option("log_min_messages", "warning",
PGC_SUSET, PGC_S_SESSION,
@ -836,7 +836,7 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
* but we cannot do that. We have to actually set the search_path GUC in
* case the extension script examines or changes it.
*/
save_search_path = pstrdup(GetConfigOption("search_path", false));
save_search_path = pstrdup(GetConfigOption("search_path", false, false));
initStringInfo(&pathbuf);
appendStringInfoString(&pathbuf, quote_identifier(schemaName));

6
src/backend/utils/misc/guc-file.l
View File

@ -306,9 +306,9 @@ ProcessConfigFile(GucContext context)
/* In SIGHUP cases in the postmaster, report changes */
if (context == PGC_SIGHUP && !IsUnderPostmaster)
{
const char *preval = GetConfigOption(item->name, false);
const char *preval = GetConfigOption(item->name, true, false);
/* string variables could be NULL; treat that as empty */
/* If option doesn't exist yet or is NULL, treat as empty string */
if (!preval)
preval = "";
/* must dup, else might have dangling pointer below */
@ -323,7 +323,7 @@ ProcessConfigFile(GucContext context)
if (pre_value)
{
const char *post_value = GetConfigOption(item->name, false);
const char *post_value = GetConfigOption(item->name, true, false);
if (!post_value)
post_value = "";

16
src/backend/utils/misc/guc.c
View File

@ -5828,8 +5828,11 @@ SetConfigOption(const char *name, const char *value,
/*
* Fetch the current value of the option `name'. If the option doesn't exist,
* throw an ereport and don't return.
* Fetch the current value of the option `name', as a string.
*
* If the option doesn't exist, return NULL if missing_ok is true (NOTE that
* this cannot be distinguished from a string variable with a NULL value!),
* otherwise throw an ereport and don't return.
*
* If restrict_superuser is true, we also enforce that only superusers can
* see GUC_SUPERUSER_ONLY variables. This should only be passed as true
@ -5839,16 +5842,21 @@ SetConfigOption(const char *name, const char *value,
* valid until the next call to configuration related functions.
*/
const char *
GetConfigOption(const char *name, bool restrict_superuser)
GetConfigOption(const char *name, bool missing_ok, bool restrict_superuser)
{
struct config_generic *record;
static char buffer[256];
record = find_option(name, false, ERROR);
if (record == NULL)
{
if (missing_ok)
return NULL;
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("unrecognized configuration parameter \"%s\"", name)));
errmsg("unrecognized configuration parameter \"%s\"",
name)));
}
if (restrict_superuser &&
(record->flags & GUC_SUPERUSER_ONLY) &&
!superuser())

3
src/include/utils/guc.h
View File

@ -296,7 +296,8 @@ extern void DefineCustomEnumVariable(
extern void EmitWarningsOnPlaceholders(const char *className);
extern const char *GetConfigOption(const char *name, bool restrict_superuser);
extern const char *GetConfigOption(const char *name, bool missing_ok,
bool restrict_superuser);
extern const char *GetConfigOptionResetString(const char *name);
extern void ProcessConfigFile(GucContext context);
extern void InitializeGUCOptions(void);