NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit4542581

committed

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

default settings, rather than just Win32.

1 parentc93872d commit4542581Copy full SHA for 4542581

File tree

2 files changed

-8

lines changed

src
- backend/libpq
  - pg_hba.conf.sample
- bin/initdb
  - initdb.c

2 files changed

-8

lines changed

`‎src/backend/libpq/pg_hba.conf.sample`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@`
`60`	`60`
`61`	`61`	`# TYPE DATABASE USER CIDR-ADDRESS METHOD`
`62`	`62`
`63`		`-@remove-line-for-win32@# "local" is for Unix domain socket connections only`
`64`		`-@remove-line-for-win32@local all all @authmethod@`
	`63`	`+@remove-line-for-nolocal@# "local" is for Unix domain socket connections only`
	`64`	`+@remove-line-for-nolocal@local all all @authmethod@`
`65`	`65`	`# IPv4 local connections:`
`66`	`66`	`host all all 127.0.0.1/32 @authmethod@`
`67`	`67`	`# IPv6 local connections:`

`‎src/bin/initdb/initdb.c`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`* Portions Copyright (c) 1994, Regents of the University of California`
`40`	`40`	`* Portions taken from FreeBSD.`
`41`	`41`	`*`
`42`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.55 2004/10/06 09:01:18 momjian Exp $`
	`42`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.56 2004/10/06 09:13:10 momjian Exp $`
`43`	`43`	`*`
`44`	`44`	`*-------------------------------------------------------------------------`
`45`	`45`	`*/`
`@@ -147,7 +147,7 @@ charbackend_exec[MAXPGPATH];`
`147`	`147`	`staticvoid*xmalloc(size_tsize);`
`148`	`148`	`staticcharxstrdup(constchars);`
`149`	`149`	`staticcharreplace_token(charlines,chartoken,charreplacement);`
`150`		`-#ifdefWIN32`
	`150`	`+#ifndefHAVE_UNIX_SOCKETS`
`151`	`151`	`staticcharfilter_lines_with_token(charlines,char*token);`
`152`	`152`	`#endif`
`153`	`153`	`staticchar*readfile(charpath);`
`@@ -318,7 +318,7 @@ replace_token(char *lines, char token, char *replacement)`
`318`	`318`	`* a sort of poor man's grep -v`
`319`	`319`	`*`
`320`	`320`	`*/`
`321`		`-#ifdefWIN32`
	`321`	`+#ifndefHAVE_UNIX_SOCKETS`
`322`	`322`	`staticchar**`
`323`	`323`	`filter_lines_with_token(char*lines,chartoken)`
`324`	`324`	`{`
`@@ -1124,10 +1124,10 @@ setup_config(void)`
`1124`	`1124`
`1125`	`1125`	`conflines=readfile(hba_file);`
`1126`	`1126`
`1127`		`-#ifdefWIN32`
`1128`		`-conflines=filter_lines_with_token(conflines,"@remove-line-for-win32@");`
	`1127`	`+#ifndefHAVE_UNIX_SOCKETS`
	`1128`	`+conflines=filter_lines_with_token(conflines,"@remove-line-for-nolocal@");`
`1129`	`1129`	`#else`
`1130`		`-conflines=replace_token(conflines,"@remove-line-for-win32@","");`
	`1130`	`+conflines=replace_token(conflines,"@remove-line-for-nolocal@","");`
`1131`	`1131`	`#endif`
`1132`	`1132`
`1133`	`1133`	`#ifndefHAVE_IPV6`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4542581

File tree

2 files changed

2 files changed

`‎src/backend/libpq/pg_hba.conf.sample`

`‎src/bin/initdb/initdb.c`

0 commit comments