Cleanup of 'sameuser' patch.

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 018a3864c972a3e8393c448beec222e830df52f3..a0098c65188154fb45c6a294f1ec57732b55a702 100644 (file)
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.31 1998/06/13 04:27:15 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.32 1998/06/13 05:14:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -210,8 +210,8 @@ process_hba_record(FILE *file, SockAddr *raddr, const char user[],
         * sort of connection, ignore it.
         */
 
-       if ((strcmp(buf, database) != 0 && strcmp(buf, "all") != 0 &&
-           (strcmp(buf, "sameuser") != 0 || strcmp(user, database) != 0)) ||
+       if ((strcmp(db, database) != 0 && strcmp(db, "all") != 0 &&
+           (strcmp(db, "sameuser") != 0 || strcmp(database, user) != 0)) ||
            raddr->sa.sa_family != AF_UNIX)
            return;
    }
@@ -270,8 +270,8 @@ process_hba_record(FILE *file, SockAddr *raddr, const char user[],
         * sort of connection, ignore it.
         */
 
-       if ((strcmp(buf, database) != 0 && strcmp(buf, "all") != 0 &&
-           (strcmp(buf, "sameuser") != 0 || strcmp(user, database) != 0)) ||
+       if ((strcmp(db, database) != 0 && strcmp(db, "all") != 0 &&
+           (strcmp(db, "sameuser") != 0 || strcmp(database, user) != 0)) ||
            raddr->sa.sa_family != AF_INET ||
            ((file_ip_addr.s_addr ^ raddr->in.sin_addr.s_addr) & mask.s_addr) != 0x0000)
            return;

diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample
index 268649afada78cd5c11f4482dba8f0870c07b875..e53f505b4a36d4c7b234089c4d30cb3aa5336a34 100644 (file)
--- a/src/backend/libpq/pg_hba.conf.sample
+++ b/src/backend/libpq/pg_hba.conf.sample
@@ -128,4 +128,4 @@
 # By default, allow anything over UNIX domain sockets and localhost.
 
 local        all                                         trust
-host         all         127.0.0.1     255.255.255.255   trust     
+host         all         127.0.0.1     255.255.255.255   trust