diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-06-13 05:14:56 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-06-13 05:14:56 +0000 |
| commit | d3d541996b52f6170c2613129e8b8be2b0411943 (patch) | |
| tree | 10497c15e25231e6fb72c94c81725117dc048d69 /src | |
| parent | 3f372ee6b3d8a92921d6f81fd64918189f55f987 (diff) | |
| download | postgresql-d3d541996b52f6170c2613129e8b8be2b0411943.tar.gz postgresql-d3d541996b52f6170c2613129e8b8be2b0411943.zip | |
Cleanup of 'sameuser' patch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/hba.c | 10 | ||||
| -rw-r--r-- | src/backend/libpq/pg_hba.conf.sample | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 018a3864c97..a0098c65188 100644 --- 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 268649afada..e53f505b4a3 100644 --- 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 |