c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make aclcontains() do something that's at least vaguely reasonable:

Browse source 
it now returns true if the aclitem argument exactly matches any one of
the elements of the aclitem[] argument.  Per complaint from Wolff 1/10/01.
This commit is contained in:
Tom Lane 2001-01-14 19:23:27 +00:00
parent 36839c1927
commit c0f069944f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/backend/utils/adt/acl.c
View file

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.55 2000/12/03 20:45:35 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.56 2001/01/14 19:23:27 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -333,8 +333,10 @@ aclitemout(PG_FUNCTION_ARGS)
* aclitemeq * aclitemeq
* aclitemgt * aclitemgt
* AclItem equality and greater-than comparison routines. * AclItem equality and greater-than comparison routines.
* Two AclItems are equal iff they have the * Two AclItems are considered equal iff they have the
* same identifier (and identifier type). * same identifier (and identifier type); the mode is ignored.
* Note that these routines are really only useful for sorting
* AclItems into identifier order.
* *
* RETURNS: * RETURNS:
* a boolean value indicating = or > * a boolean value indicating = or >
@ -581,8 +583,12 @@ aclcontains(PG_FUNCTION_ARGS)
num = ACL_NUM(acl); num = ACL_NUM(acl);
aidat = ACL_DAT(acl); aidat = ACL_DAT(acl);
for (i = 0; i < num; ++i) for (i = 0; i < num; ++i)
if (aclitemeq(aip, aidat + i)) {
/* Note that aclitemeq only considers id, not mode */
if (aclitemeq(aip, aidat + i) &&
aip->ai_mode == aidat[i].ai_mode)
PG_RETURN_BOOL(true); PG_RETURN_BOOL(true);
}
PG_RETURN_BOOL(false); PG_RETURN_BOOL(false);
} }