diff options
Diffstat (limited to 'src/backend/utils/init')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 32f7cc06415..599fc9938b6 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.162 2007/02/15 23:23:23 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.163 2007/09/03 00:39:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -448,7 +448,12 @@ InitializeSessionUserId(const char *rolename) { ArrayType *a = DatumGetArrayTypeP(datum); - ProcessGUCArray(a, PGC_S_USER); + /* + * We process all the options at SUSET level. We assume that the + * right to insert an option into pg_authid was checked when it was + * inserted. + */ + ProcessGUCArray(a, PGC_SUSET, PGC_S_USER, false); } ReleaseSysCache(roleTup); diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index ff70c8d6a66..965e94a5387 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.176 2007/05/27 05:37:49 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.177 2007/09/03 00:39:18 tgl Exp $ * * *------------------------------------------------------------------------- @@ -250,7 +250,12 @@ CheckMyDatabase(const char *name, bool am_superuser) { ArrayType *a = DatumGetArrayTypeP(datum); - ProcessGUCArray(a, PGC_S_DATABASE); + /* + * We process all the options at SUSET level. We assume that the + * right to insert an option into pg_database was checked when it + * was inserted. + */ + ProcessGUCArray(a, PGC_SUSET, PGC_S_DATABASE, false); } } |