mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjustment to test on unix domain socket variable for pg_hba.conf

Browse Source 
default settings, rather than just Win32.
This commit is contained in:
Bruce Momjian 2004-10-06 09:13:10 +00:00
parent c93872d891
commit 4542581bf1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/libpq/pg_hba.conf.sample
View File

@ -60,8 +60,8 @@
# TYPE DATABASE USER CIDR-ADDRESS METHOD # TYPE DATABASE USER CIDR-ADDRESS METHOD
@remove-line-for-win32@# "local" is for Unix domain socket connections only @remove-line-for-nolocal@# "local" is for Unix domain socket connections only
@remove-line-for-win32@local all all @authmethod@ @remove-line-for-nolocal@local all all @authmethod@
# IPv4 local connections: # IPv4 local connections:
host all all 127.0.0.1/32 @authmethod@ host all all 127.0.0.1/32 @authmethod@
# IPv6 local connections: # IPv6 local connections:

12
src/bin/initdb/initdb.c
View File

@ -39,7 +39,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.55 2004/10/06 09:01:18 momjian Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.56 2004/10/06 09:13:10 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -147,7 +147,7 @@ char backend_exec[MAXPGPATH];
static void *xmalloc(size_t size); static void *xmalloc(size_t size);
static char *xstrdup(const char *s); static char *xstrdup(const char *s);
static char **replace_token(char **lines, char *token, char *replacement); static char **replace_token(char **lines, char *token, char *replacement);
#ifdef WIN32 #ifndef HAVE_UNIX_SOCKETS
static char **filter_lines_with_token(char **lines, char *token); static char **filter_lines_with_token(char **lines, char *token);
#endif #endif
static char **readfile(char *path); static char **readfile(char *path);
@ -318,7 +318,7 @@ replace_token(char **lines, char *token, char *replacement)
* a sort of poor man's grep -v * a sort of poor man's grep -v
* *
*/ */
#ifdef WIN32 #ifndef HAVE_UNIX_SOCKETS
static char ** static char **
filter_lines_with_token(char **lines, char *token) filter_lines_with_token(char **lines, char *token)
{ {
@ -1124,10 +1124,10 @@ setup_config(void)
conflines = readfile(hba_file); conflines = readfile(hba_file);
#ifdef WIN32 #ifndef HAVE_UNIX_SOCKETS
conflines = filter_lines_with_token(conflines,"@remove-line-for-win32@"); conflines = filter_lines_with_token(conflines,"@remove-line-for-nolocal@");
#else #else
conflines = replace_token(conflines,"@remove-line-for-win32@",""); conflines = replace_token(conflines,"@remove-line-for-nolocal@","");
#endif #endif
#ifndef HAVE_IPV6 #ifndef HAVE_IPV6