Remove code associated with !ACLGROUP_PATCH, and appropriate #ifdef's

diff --git a/src/backend/tcop/aclchk.c b/src/backend/tcop/aclchk.c
index 7ca6bdd33b8a75cd16b5e3c102396d636a20d7d8..a60794af085d50e491b9448712ae1be7e02483fa 100644 (file)
--- 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 8ee3faee34aa10a1f56faea19174e7a270a41843..7794fca3f8609be3c2e54b7882ddb4187a977fa9 100644 (file)
--- 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