diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-11-14 19:35:35 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-11-14 19:35:35 +0000 |
| commit | ea23ec82c2ec2ac14007f002692743b67b18f80f (patch) | |
| tree | f2cc94b72ce963bfc815834154d542723c2f0623 /src/include/utils/guc.h | |
| parent | 1c7a47cea42fadf91d343e7f037225d5834f3df0 (diff) | |
| download | postgresql-ea23ec82c2ec2ac14007f002692743b67b18f80f.tar.gz postgresql-ea23ec82c2ec2ac14007f002692743b67b18f80f.zip | |
Remove GUC USERLIMIT variable category, making the affected variables
plain SUSET instead. Also delay processing of options received in
client connection request until after we know if the user is a superuser,
so that SUSET values can be set that way by legitimate superusers.
Per recent discussion.
Diffstat (limited to 'src/include/utils/guc.h')
| -rw-r--r-- | src/include/utils/guc.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 19ae296559d..f5f4a78fe4d 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.55 2004/11/05 19:16:41 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.56 2004/11/14 19:35:35 tgl Exp $ *-------------------------------------------------------------------- */ #ifndef GUC_H @@ -48,9 +48,6 @@ * be set in the connection startup packet, because when it is processed * we don't yet know if the user is a superuser. * - * USERLIMIT options can only be manipulated in certain ways by - * non-superusers. - * * USERSET options can be set by anyone any time. */ typedef enum @@ -60,7 +57,6 @@ typedef enum PGC_SIGHUP, PGC_BACKEND, PGC_SUSET, - PGC_USERLIMIT, PGC_USERSET } GucContext; @@ -74,9 +70,7 @@ typedef enum * as the current value. Note that source == PGC_S_OVERRIDE should be * used when setting a PGC_INTERNAL option. * - * PGC_S_UNPRIVILEGED isn't actually a source value, but the dividing line - * between privileged and unprivileged sources for USERLIMIT purposes. - * Similarly, PGC_S_INTERACTIVE isn't a real source value, but is the + * PGC_S_INTERACTIVE isn't actually a source value, but is the * dividing line between "interactive" and "non-interactive" sources for * error reporting purposes. * @@ -92,7 +86,6 @@ typedef enum PGC_S_ENV_VAR, /* postmaster environment variable */ PGC_S_FILE, /* postgresql.conf */ PGC_S_ARGV, /* postmaster command line */ - PGC_S_UNPRIVILEGED, /* dividing line for USERLIMIT */ PGC_S_DATABASE, /* per-database setting */ PGC_S_USER, /* per-user setting */ PGC_S_CLIENT, /* from client connection request */ |