mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ALTER DATABASE RENAME to allow the operation if user is a superuser

Browse Source 
who for some reason isn't marked usecreatedb.  Per report from Alexander
Pravking.  Also fix sloppy coding in have_createdb_privilege().
This commit is contained in:
Tom Lane 2005-03-12 21:11:50 +00:00
parent fa5e44017a
commit c7bbe99452
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/commands/dbcommands.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.152 2005/03/04 20:21:05 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.153 2005/03/12 21:11:50 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -722,8 +722,8 @@ RenameDatabase(const char *oldname, const char *newname)
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE, aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
oldname); oldname);
/* must have createdb */ /* must have createdb rights */
if (!have_createdb_privilege()) if (!superuser() && !have_createdb_privilege())
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("permission denied to rename database"))); errmsg("permission denied to rename database")));
@ -883,8 +883,7 @@ AlterDatabaseOwner(const char *dbname, AclId newOwnerSysId)
bool isNull; bool isNull;
HeapTuple newtuple; HeapTuple newtuple;
/* changing owner's database for someone else: must be superuser */ /* must be superuser to change ownership */
/* note that the someone else need not have any permissions */
if (!superuser()) if (!superuser())
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
@ -999,24 +998,22 @@ get_db_info(const char *name, Oid *dbIdP, int4 *ownerIdP,
return gottuple; return gottuple;
} }
/* Check if current user has createdb privileges */
static bool static bool
have_createdb_privilege(void) have_createdb_privilege(void)
{ {
bool result = false;
HeapTuple utup; HeapTuple utup;
bool retval;
utup = SearchSysCache(SHADOWSYSID, utup = SearchSysCache(SHADOWSYSID,
Int32GetDatum(GetUserId()), Int32GetDatum(GetUserId()),
0, 0, 0); 0, 0, 0);
if (HeapTupleIsValid(utup))
if (!HeapTupleIsValid(utup)) {
retval = false; result = ((Form_pg_shadow) GETSTRUCT(utup))->usecreatedb;
else ReleaseSysCache(utup);
retval = ((Form_pg_shadow) GETSTRUCT(utup))->usecreatedb; }
return result;
ReleaseSysCache(utup);
return retval;
} }
/* /*