diff options
| author | Tom Lane | 2005-06-28 05:09:14 +0000 |
|---|---|---|
| committer | Tom Lane | 2005-06-28 05:09:14 +0000 |
| commit | 7762619e95272974f90a38d8d85aafbe0e94add5 (patch) | |
| tree | d7f756687beb883406489d59d13f722995fd7660 /src/backend/postmaster | |
| parent | 977530d8da2683dff036c2994395ab518527b93e (diff) | |
Replace pg_shadow and pg_group by new role-capable catalogs pg_authid
and pg_auth_members. There are still many loose ends to finish in this
patch (no documentation, no regression tests, no pg_dump support for
instance). But I'm going to commit it now anyway so that Alvaro can
make some progress on shared dependencies. The catalog changes should
be pretty much done.
Diffstat (limited to 'src/backend/postmaster')
| -rw-r--r-- | src/backend/postmaster/pgstat.c | 3 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 19 |
2 files changed, 9 insertions, 13 deletions
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 8366bdb8b4c..b429275d9f6 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.96 2005/06/25 23:58:57 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.97 2005/06/28 05:08:59 tgl Exp $ * ---------- */ #include "postgres.h" @@ -34,7 +34,6 @@ #include "access/heapam.h" #include "access/xact.h" #include "catalog/pg_database.h" -#include "catalog/pg_shadow.h" #include "libpq/libpq.h" #include "libpq/pqsignal.h" #include "mb/pg_wchar.h" diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 6ca13944f8a..27b28b89f54 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.454 2005/06/17 22:32:44 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.455 2005/06/28 05:08:59 tgl Exp $ * * NOTES * @@ -2032,12 +2032,11 @@ reaper(SIGNAL_ARGS) FatalError = false; /* - * Load the flat user/group files into postmaster's caches. - * The startup process has recomputed these from the database - * contents, so we wait till it finishes before loading them. + * Load the flat authorization file into postmaster's cache. + * The startup process has recomputed this from the database + * contents, so we wait till it finishes before loading it. */ - load_user(); - load_group(); + load_role(); /* * Crank up the background writer. It doesn't matter if this @@ -2664,8 +2663,7 @@ BackendRun(Port *port) load_hba(); load_ident(); - load_user(); - load_group(); + load_role(); #endif /* @@ -3290,10 +3288,9 @@ sigusr1_handler(SIGNAL_ARGS) if (CheckPostmasterSignal(PMSIGNAL_PASSWORD_CHANGE)) { /* - * Password or group file has changed. + * Authorization file has changed. */ - load_user(); - load_group(); + load_role(); } if (CheckPostmasterSignal(PMSIGNAL_WAKEN_CHILDREN)) |