From a03dc605085f2f01b954a376094daef71cb8aa3d Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Thu, 3 Apr 1997 21:31:57 +0000
Subject: [PATCH] Remove code associated with !ACLGROUP_PATCH, and appropriate
 #ifdef's

---
 src/backend/tcop/aclchk.c | 14 +-------------
 src/include/config.h.in   | 11 -----------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/backend/tcop/aclchk.c b/src/backend/tcop/aclchk.c
index 7ca6bdd33b..a60794af08 100644
--- a/src/backend/tcop/aclchk.c
+++ b/src/backend/tcop/aclchk.c
@@ -7,7 +7,7 @@
  *
  *
  * 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
  *    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, ++aip) {
 	    if (in_group(id, aip->ai_id)) {
-#ifdef ACLGROUP_PATCH
 		if (aip->ai_mode & mode) {
 		    found_group = 1;
                     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) {
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 8ee3faee34..7794fca3f8 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -113,17 +113,6 @@
 
 #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
  * that take something other than an int argument should change this in