Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit780068f

Browse files
committed
From: Jan Wieck <jwieck@debis.com>
 seems that my last post didn't make it through. That's good since the diff itself didn't covered the renaming of pg_user.h to pg_shadow.h and it's new content. Here it's again. The complete regression test passwd with only some float diffs. createuser and destroyuser work. pg_shadow cannot be read by ordinary user.
1 parentd067f83 commit780068f

File tree

25 files changed

+260
-144
lines changed

25 files changed

+260
-144
lines changed

‎src/backend/catalog/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.8 1998/01/05 18:42:39 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.9 1998/02/25 13:05:55 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -27,7 +27,7 @@ SUBSYS.o: $(OBJS)
2727
GENBKI= ./genbki.sh
2828

2929
GLOBALBKI_SRCS=$(addprefix ../../include/catalog/, \
30-
pg_database.h pg_variable.hpg_user.h \
30+
pg_database.h pg_variable.hpg_shadow.h \
3131
pg_group.h pg_log.h \
3232
)
3333

‎src/backend/catalog/aclchk.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.6 1998/02/24 03:31:45 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.7 1998/02/25 13:05:57 scrappy Exp $
1111
*
1212
* NOTES
1313
* See acl.h.
@@ -32,7 +32,7 @@
3232
#include"catalog/pg_aggregate.h"
3333
#include"catalog/pg_proc.h"
3434
#include"catalog/pg_type.h"
35-
#include"catalog/pg_user.h"
35+
#include"catalog/pg_shadow.h"
3636
#include"parser/parse_agg.h"
3737
#include"parser/parse_func.h"
3838
#include"utils/syscache.h"
@@ -396,14 +396,14 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
396396
if (!HeapTupleIsValid(htp))
397397
elog(ERROR,"pg_aclcheck: user \"%s\" not found",
398398
usename);
399-
id= (AclId) ((Form_pg_user)GETSTRUCT(htp))->usesysid;
399+
id= (AclId) ((Form_pg_shadow)GETSTRUCT(htp))->usesysid;
400400

401401
/*
402402
* for the 'pg_database' relation, check the usecreatedb field before
403403
* checking normal permissions
404404
*/
405405
if (strcmp(DatabaseRelationName,relname)==0&&
406-
(((Form_pg_user)GETSTRUCT(htp))->usecreatedb))
406+
(((Form_pg_shadow)GETSTRUCT(htp))->usecreatedb))
407407
{
408408

409409
/*
@@ -417,12 +417,12 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
417417

418418
/*
419419
* Deny anyone permission to update a system catalog unless
420-
*pg_user.usecatupd is set. (This is to let superusers protect
420+
*pg_shadow.usecatupd is set. (This is to let superusers protect
421421
* themselves from themselves.)
422422
*/
423423
if (((mode&ACL_WR)|| (mode&ACL_AP))&&
424424
IsSystemRelationName(relname)&&
425-
!((Form_pg_user)GETSTRUCT(htp))->usecatupd)
425+
!((Form_pg_shadow)GETSTRUCT(htp))->usecatupd)
426426
{
427427
elog(DEBUG,"pg_aclcheck: catalog update to \"%s\": permission denied",
428428
relname);
@@ -432,7 +432,7 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
432432
/*
433433
* Otherwise, superusers bypass all permission-checking.
434434
*/
435-
if (((Form_pg_user)GETSTRUCT(htp))->usesuper)
435+
if (((Form_pg_shadow)GETSTRUCT(htp))->usesuper)
436436
{
437437
#ifdefACLDEBUG_TRACE
438438
elog(DEBUG,"pg_aclcheck: \"%s\" is superuser",
@@ -531,12 +531,12 @@ pg_ownercheck(char *usename,
531531
if (!HeapTupleIsValid(htp))
532532
elog(ERROR,"pg_ownercheck: user \"%s\" not found",
533533
usename);
534-
user_id= (AclId) ((Form_pg_user)GETSTRUCT(htp))->usesysid;
534+
user_id= (AclId) ((Form_pg_shadow)GETSTRUCT(htp))->usesysid;
535535

536536
/*
537537
* Superusers bypass all permission-checking.
538538
*/
539-
if (((Form_pg_user)GETSTRUCT(htp))->usesuper)
539+
if (((Form_pg_shadow)GETSTRUCT(htp))->usesuper)
540540
{
541541
#ifdefACLDEBUG_TRACE
542542
elog(DEBUG,"pg_ownercheck: user \"%s\" is superuser",
@@ -597,12 +597,12 @@ pg_func_ownercheck(char *usename,
597597
if (!HeapTupleIsValid(htp))
598598
elog(ERROR,"pg_func_ownercheck: user \"%s\" not found",
599599
usename);
600-
user_id= (AclId) ((Form_pg_user)GETSTRUCT(htp))->usesysid;
600+
user_id= (AclId) ((Form_pg_shadow)GETSTRUCT(htp))->usesysid;
601601

602602
/*
603603
* Superusers bypass all permission-checking.
604604
*/
605-
if (((Form_pg_user)GETSTRUCT(htp))->usesuper)
605+
if (((Form_pg_shadow)GETSTRUCT(htp))->usesuper)
606606
{
607607
#ifdefACLDEBUG_TRACE
608608
elog(DEBUG,"pg_ownercheck: user \"%s\" is superuser",
@@ -638,12 +638,12 @@ pg_aggr_ownercheck(char *usename,
638638
if (!HeapTupleIsValid(htp))
639639
elog(ERROR,"pg_aggr_ownercheck: user \"%s\" not found",
640640
usename);
641-
user_id= (AclId) ((Form_pg_user)GETSTRUCT(htp))->usesysid;
641+
user_id= (AclId) ((Form_pg_shadow)GETSTRUCT(htp))->usesysid;
642642

643643
/*
644644
* Superusers bypass all permission-checking.
645645
*/
646-
if (((Form_pg_user)GETSTRUCT(htp))->usesuper)
646+
if (((Form_pg_shadow)GETSTRUCT(htp))->usesuper)
647647
{
648648
#ifdefACLDEBUG_TRACE
649649
elog(DEBUG,"pg_aggr_ownercheck: user \"%s\" is superuser",

‎src/backend/commands/copy.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.42 1998/02/13 19:45:38 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.43 1998/02/25 13:06:08 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -32,7 +32,7 @@
3232
#include<access/genam.h>
3333
#include<catalog/pg_type.h>
3434
#include<catalog/catname.h>
35-
#include<catalog/pg_user.h>
35+
#include<catalog/pg_shadow.h>
3636
#include<commands/copy.h>
3737
#include"commands/trigger.h"
3838
#include<storage/fd.h>

‎src/backend/commands/dbcommands.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.6 1998/01/31 04:38:19 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.7 1998/02/25 13:06:09 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -25,7 +25,7 @@
2525
#include"utils/elog.h"
2626
#include"catalog/catname.h"
2727
#include"catalog/pg_proc.h"
28-
#include"catalog/pg_user.h"
28+
#include"catalog/pg_shadow.h"
2929
#include"catalog/pg_database.h"
3030
#include"utils/syscache.h"
3131
#include"commands/dbcommands.h"
@@ -211,9 +211,9 @@ check_permissions(char *command,
211211
userName=GetPgUserName();
212212
utup=SearchSysCacheTuple(USENAME,PointerGetDatum(userName),
213213
0,0,0);
214-
*userIdP= ((Form_pg_user)GETSTRUCT(utup))->usesysid;
215-
use_super= ((Form_pg_user)GETSTRUCT(utup))->usesuper;
216-
use_createdb= ((Form_pg_user)GETSTRUCT(utup))->usecreatedb;
214+
*userIdP= ((Form_pg_shadow)GETSTRUCT(utup))->usesysid;
215+
use_super= ((Form_pg_shadow)GETSTRUCT(utup))->usesuper;
216+
use_createdb= ((Form_pg_shadow)GETSTRUCT(utup))->usecreatedb;
217217

218218
/* Check to make sure user has permission to use createdb */
219219
if (!use_createdb)

‎src/backend/commands/define.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.22 1998/02/13 13:23:33 scrappy Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.23 1998/02/25 13:06:12 scrappy Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -52,7 +52,7 @@
5252
#include<commands/defrem.h>
5353
#include<optimizer/xfunc.h>
5454
#include<tcop/dest.h>
55-
#include<catalog/pg_user.h>
55+
#include<catalog/pg_shadow.h>
5656

5757
staticchar*defGetString(DefElem*def);
5858
staticintdefGetTypeLength(DefElem*def);

‎src/backend/commands/proclang.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include"access/heapam.h"
1313
#include"catalog/catname.h"
14-
#include"catalog/pg_user.h"
14+
#include"catalog/pg_shadow.h"
1515
#include"catalog/pg_proc.h"
1616
#include"catalog/pg_language.h"
1717
#include"utils/syscache.h"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp