mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-01 05:41:15 +02:00
Remove code associated with !ACLGROUP_PATCH, and appropriate #ifdef's
This commit is contained in:
parent
e3649e9e52
commit
a03dc60508
@ -7,7 +7,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.8 1997/04/03 19:55:12 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.9 1997/04/03 21:31:47 scrappy Exp $
|
||||||
*
|
*
|
||||||
* NOTES
|
* NOTES
|
||||||
* See acl.h.
|
* See acl.h.
|
||||||
@ -300,22 +300,10 @@ aclcheck(Acl *acl, AclId id, AclIdType idtype, AclMode mode)
|
|||||||
i < num && aip->ai_idtype == ACL_IDTYPE_GID;
|
i < num && aip->ai_idtype == ACL_IDTYPE_GID;
|
||||||
++i, ++aip) {
|
++i, ++aip) {
|
||||||
if (in_group(id, aip->ai_id)) {
|
if (in_group(id, aip->ai_id)) {
|
||||||
#ifdef ACLGROUP_PATCH
|
|
||||||
if (aip->ai_mode & mode) {
|
if (aip->ai_mode & mode) {
|
||||||
found_group = 1;
|
found_group = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
if (aip->ai_mode & mode)
|
|
||||||
++found_group;
|
|
||||||
else {
|
|
||||||
#ifdef ACLDEBUG_TRACE
|
|
||||||
elog(DEBUG, "aclcheck: found %d/%d",
|
|
||||||
aip->ai_id, aip->ai_mode);
|
|
||||||
#endif
|
|
||||||
return ACLCHECK_NO_PRIV;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (found_group) {
|
if (found_group) {
|
||||||
|
@ -113,17 +113,6 @@
|
|||||||
|
|
||||||
#include "os.h"
|
#include "os.h"
|
||||||
|
|
||||||
/* This patch changes the behavior of aclcheck for groups. Currently an user
|
|
||||||
* can access a table only if he has the required permission for ALL the groups
|
|
||||||
* defined for that table. With my patch he can access a table if he has the
|
|
||||||
* permission for ONE of the groups, which seems to me a more useful thing.
|
|
||||||
*
|
|
||||||
* Used in: src/backend/tcop/aclchk.c
|
|
||||||
* Submitted by: Massimo Dal Zotto <dz@cs.unitn.it>
|
|
||||||
*/
|
|
||||||
#define ACLGROUP_PATCH
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The following is used as the arg list for signal handlers. Any ports
|
* The following is used as the arg list for signal handlers. Any ports
|
||||||
* that take something other than an int argument should change this in
|
* that take something other than an int argument should change this in
|
||||||
|
Loading…
Reference in New Issue
Block a user