by a superuser -- "ALTER USER f RESET setting" already disallows removing such a
setting.
Apply the same treatment to ALTER DATABASE d RESET ALL when run by a database
owner that's not superuser.
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.124.2.2 2005/03/12 21:12:18 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.124.2.3 2010/03/25 14:46:04 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
if (strcmp(stmt->variable, "all") == 0 && valuestr == NULL)
{
- /* RESET ALL */
- repl_null[Anum_pg_database_datconfig - 1] = 'n';
- repl_val[Anum_pg_database_datconfig - 1] = (Datum) 0;
+ ArrayType *new = NULL;
+ Datum datum;
+ bool isnull;
+
+ /*
+ * in RESET ALL, request GUC to reset the settings array; if none
+ * left, we can set datconfig to null; otherwise use the returned
+ * array
+ */
+ datum = heap_getattr(tuple, Anum_pg_database_datconfig,
+ RelationGetDescr(rel), &isnull);
+ if (!isnull)
+ new = GUCArrayReset(DatumGetArrayTypeP(datum));
+ if (new)
+ {
+ repl_val[Anum_pg_database_datconfig - 1] = PointerGetDatum(new);
+ repl_repl[Anum_pg_database_datconfig - 1] = 'r';
+ repl_null[Anum_pg_database_datconfig - 1] = ' ';
+ }
+ else
+ {
+ repl_null[Anum_pg_database_datconfig - 1] = 'n';
+ repl_val[Anum_pg_database_datconfig - 1] = (Datum) 0;
+ }
}
else
{
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.128 2003/10/02 06:36:37 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.128.2.1 2010/03/25 14:46:04 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
repl_repl[Anum_pg_shadow_useconfig - 1] = 'r';
if (strcmp(stmt->variable, "all") == 0 && valuestr == NULL)
{
- /* RESET ALL */
- repl_null[Anum_pg_shadow_useconfig - 1] = 'n';
+ ArrayType *new = NULL;
+ Datum datum;
+ bool isnull;
+
+ /*
+ * in RESET ALL, request GUC to reset the settings array; if none
+ * left, we can set useconfig to null; otherwise use the returned
+ * array
+ */
+ datum = SysCacheGetAttr(SHADOWNAME, oldtuple,
+ Anum_pg_shadow_useconfig, &isnull);
+ if (!isnull)
+ new = GUCArrayReset(DatumGetArrayTypeP(datum));
+ if (new)
+ {
+ repl_val[Anum_pg_shadow_useconfig - 1] = PointerGetDatum(new);
+ repl_repl[Anum_pg_shadow_useconfig - 1] = 'r';
+ repl_null[Anum_pg_shadow_useconfig - 1] = ' ';
+ }
+ else
+ {
+ repl_null[Anum_pg_shadow_useconfig - 1] = 'n';
+ repl_val[Anum_pg_shadow_useconfig - 1] = (Datum) 0;
+ }
}
else
{
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.164.2.8 2010/02/25 23:45:28 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.164.2.9 2010/03/25 14:46:06 alvherre Exp $
*
*--------------------------------------------------------------------
*/
free(name);
if (value)
free(value);
+ pfree(s);
}
}
&& val[strlen(name)] == '=')
continue;
+
+ /* else add it to the output array */
+ if (newarray)
+ {
+ isnull = false;
+ newarray = array_set(newarray, 1, &index,
+ d,
+ -1 /* varlenarray */ ,
+ -1 /* TEXT's typlen */ ,
+ false /* TEXT's typbyval */ ,
+ 'i' /* TEXT's typalign */ ,
+ &isnull);
+ }
+ else
+ newarray = construct_array(&d, 1,
+ TEXTOID,
+ -1, false, 'i');
+
+ index++;
+ }
+
+ return newarray;
+}
+
+/*
+ * Given a GUC array, delete all settings from it that our permission
+ * level allows: if superuser, delete them all; if regular user, only
+ * those that are PGC_USERSET
+ */
+ArrayType *
+GUCArrayReset(ArrayType *array)
+{
+ ArrayType *newarray;
+ int i;
+ int index;
+
+ /* if array is currently null, nothing to do */
+ if (!array)
+ return NULL;
+
+ /* if we're superuser, we can delete everything */
+ if (superuser())
+ return NULL;
+
+ newarray = NULL;
+ index = 1;
+
+ for (i = 1; i <= ARR_DIMS(array)[0]; i++)
+ {
+ Datum d;
+ char *val;
+ char *eqsgn;
+ bool isnull;
+ struct config_generic *gconf;
+
+ d = array_ref(array, 1, &i,
+ -1 /* varlenarray */ ,
+ -1 /* TEXT's typlen */ ,
+ false /* TEXT's typbyval */ ,
+ 'i' /* TEXT's typalign */ ,
+ &isnull);
+
+ if (isnull)
+ continue;
+ val = DatumGetCString(DirectFunctionCall1(textout, d));
+
+ eqsgn = strchr(val, '=');
+ *eqsgn = '\0';
+
+ gconf = find_option(val);
+ if (!gconf)
+ continue;
+
+ /* note: superuser-ness was already checked above */
+ /* skip entry if OK to delete */
+ if (gconf->context == PGC_USERSET)
+ continue;
+
+ /* XXX do we need to worry about database owner? */
+
/* else add it to the output array */
if (newarray)
{
-1, false, 'i');
index++;
+ pfree(val);
}
return newarray;
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
- * $Id: guc.h,v 1.41 2003/09/01 04:15:51 momjian Exp $
+ * $Id: guc.h,v 1.41.2.1 2010/03/25 14:46:06 alvherre Exp $
*--------------------------------------------------------------------
*/
#ifndef GUC_H
extern void ProcessGUCArray(ArrayType *array, GucSource source);
extern ArrayType *GUCArrayAdd(ArrayType *array, const char *name, const char *value);
extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name);
+extern ArrayType *GUCArrayReset(ArrayType *array);
#ifdef EXEC_BACKEND
void write_nondefault_variables(GucContext context);
projects / postgresql.git / commitdiff