Commitf39748a

committed

Forbid REVOKE on untrusted languages, and don't dump privileges of

untrusted languages (in case they sneak in).

1 parent9a1cab4 commitf39748aCopy full SHA for f39748a

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.95 2003/11/29 19:51:42 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.96 2003/12/19 14:21:56 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* See acl.h.`
`@@ -594,7 +594,7 @@ ExecuteGrantStmt_Language(GrantStmt *stmt)`
`594`	`594`	`aclcheck_error(ACLCHECK_NO_PRIV,ACL_KIND_LANGUAGE,`
`595`	`595`	`NameStr(pg_language_tuple->lanname));`
`596`	`596`
`597`		`-if (!pg_language_tuple->lanpltrusted&&stmt->is_grant)`
	`597`	`+if (!pg_language_tuple->lanpltrusted)`
`598`	`598`	`ereport(ERROR,`
`599`	`599`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`600`	`600`	`errmsg("language \"%s\" is not trusted",langname)));`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*by PostgreSQL`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.360 2003/12/06 03:00:12 tgl Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.361 2003/12/19 14:21:56 petere Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -4633,10 +4633,11 @@ dumpProcLang(Archive fout, ProcLangInfo plang)`
`4633`	`4633`	`NULL,"",`
`4634`	`4634`	`plang->dobj.catId,0,plang->dobj.dumpId);`
`4635`	`4635`
`4636`		`-dumpACL(fout,plang->dobj.catId,plang->dobj.dumpId,"LANGUAGE",`
`4637`		`-qlanname,plang->lanname,`
`4638`		`-funcInfo->pronamespace->nspname,`
`4639`		`-NULL,plang->lanacl);`
	`4636`	`+if (plang->lanpltrusted)`
	`4637`	`+dumpACL(fout,plang->dobj.catId,plang->dobj.dumpId,"LANGUAGE",`
	`4638`	`+qlanname,plang->lanname,`
	`4639`	`+funcInfo->pronamespace->nspname,`
	`4640`	`+NULL,plang->lanacl);`
`4640`	`4641`
`4641`	`4642`	`free(qlanname);`
`4642`	`4643`

Comments

(0)