8000 remove KERBEROS config cruft from Makefile.global · s-monk/postgres@1b5e30e · GitHub
[go: up one dir, main page]

Skip to content

Commit 1b5e30e

Browse files
committed
remove KERBEROS config cruft from Makefile.global
- don't advertise something that jus tdoes'nt work
1 parent fa6429d commit 1b5e30e

File tree

1 file changed

+4
-39
lines changed

1 file changed

+4
-39
lines changed
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.19.2.16 1996/10/29 19:08:46 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.19.2.17 1996/10/31 20:25:56 scrappy Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -60,7 +60,7 @@
6060
# make sure that you have no whitespaces after the PORTNAME setting
6161
# or the makefiles can get confused
6262
#
63-
PORTNAME= UNDEFINED
63+
PORTNAME= BSD44_derived
6464

6565
# SRCDIR specifies where the source files are.
6666
SRCDIR= /usr/local/postgres95/src
@@ -75,7 +75,7 @@ POSTGRESDIR= /usr/local/postgres95
7575
# you can change it to any existing login name (such as yo 8000 ur own
7676
# login if you are compiling a private version or don't have root
7777
# access).
78-
POSTGRESLOGIN= postgres
78+
POSTGRESLOGIN= scrappy
7979

8080
# DATADIR specifies where the postmaster expects to find its database.
8181
# This may be overridden by command line options or the PGDATA environment
@@ -106,7 +106,7 @@ POSTDOCDIR= $(POSTGRESDIR)/doc
106106
HEADERDIR= $(POSTGRESDIR)/include
107107

108108
# The port to run the postmaster on
109-
POSTPORT= 5432
109+
POSTPORT= 6543
110110

111111
# NAMEDATALEN is the max length for system identifiers (e.g. table names,
112112
# attribute names, function names, etc.)
@@ -176,41 +176,6 @@ ifdef HBA
176176
HBAFLAGS= -DHBA
177177
endif
178178

179-
# If you plan to use Kerberos for authentication...
180-
#
181-
# Comment out KRBVERS if you do not use Kerberos.
182-
# Set KRBVERS to "4" for Kerberos v4, "5" for Kerberos v5.
183-
# XXX Edit the default Kerberos variables below!
184-
#
185-
#KRBVERS= 5
186-
187-
# Globally pass Kerberos file locations.
188-
# these are used in the postmaster and all libpq applications.
189-
#
190-
# Adjust KRBINCS and KRBLIBS to reflect where you have Kerberos
191-
# include files and libraries installed.
192-
# PG_KRB_SRVNAM is the name under which POSTGRES is registered in
193-
# the Kerberos database (KDC).
194-
# PG_KRB_SRVTAB is the location of the server's keytab file.
195-
#
196-
ifdef KRBVERS
197-
KRBINCS= -I/usr/athena/include
198-
KRBLIBS= -L/usr/athena/lib
199-
KRBFLAGS+= $(KRBINCS) -DPG_KRB_SRVNAM='"postgres_dbms"'
200-
ifeq ($(KRBVERS), 4)
201-
KRBFLAGS+= -DKRB4
202-
KRBFLAGS+= -DPG_KRB_SRVTAB='"/etc/srvtab"'
203-
KRBLIBS+= -lkrb -ldes
204-
else
205-
ifeq ($(KRBVERS), 5)
206-
KRBFLAGS+= -DKRB5
207-
KRBFLAGS+= -DPG_KRB_SRVTAB='"FILE:/krb5/srvtab.postgres"'
208-
KRBLIBS+= -lkrb5 -lcrypto -lcom_err -lisode
209-
endif
210-
endif
211-
endif
212-
213-
#
214179
# location of Tcl/Tk headers and libraries
215180
#
216181
# Uncomment this to build the tcl utilities.
0