Skip to content

Commit dc87ea7

Browse files
committed
Include IPv6 addresses in pg_hba.conf even if IPv6 is not supported; at
suggestion of Peter.
1 parent 677d778 commit dc87ea7

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

src/backend/Makefile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.92 2003/01/07 15:12:17 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.93 2003/01/26 01:19:22 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -132,14 +132,7 @@ ifeq ($(MAKE_DLL), true)
132132
endif
133133
endif
134134
$(MAKE) -C catalog install-data
135-
ifdef HAVE_IPV6
136135
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
137-
else
138-
grep -v '^host.*::1.*ffff:ffff:ffff:ffff:ffff:ffff' \
139-
$(srcdir)/libpq/pg_hba.conf.sample \
140-
> $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6
141-
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6 $(DESTDIR)$(datadir)/pg_hba.conf.sample
142-
endif
143136
$(INSTALL_DATA) $(srcdir)/libpq/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
144137
$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
145138
$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
@@ -191,9 +184,6 @@ clean:
191184
rm -f postgres$(X) $(POSTGRES_IMP) \
192185
$(top_srcdir)/src/include/parser/parse.h \
193186
$(top_builddir)/src/include/utils/fmgroids.h
194-
ifndef HAVE_IPV6
195-
rm -f $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6
196-
endif
197187
ifeq ($(PORTNAME), win)
198188
rm -f postgres.dll postgres.def libpostgres.a
199189
endif

0 commit comments

Comments
 (0)