diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-05-27 04:13:05 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-05-27 04:13:05 +0000 |
| commit | d45f7dfdcab5ff2f8f6ad9a61e175ac4cb3883aa (patch) | |
| tree | e34b6fa14c695dea1f53153f28c79714cb59d2de /src/Makefile.global.in | |
| parent | 4f326011eebe118c82fdd5f0f6c1b12db92d988c (diff) | |
| download | postgresql-d45f7dfdcab5ff2f8f6ad9a61e175ac4cb3883aa.tar.gz | |
Update kerberos patch
Diffstat (limited to 'src/Makefile.global.in')
| -rw-r--r-- | src/Makefile.global.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index fd07ea0b53..afeadbc6f4 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.73 2000/05/27 03:58:18 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.74 2000/05/27 04:13:04 momjian Exp $ # # NOTES # Essentially all Postgres make files include this file and use the @@ -120,7 +120,7 @@ ENFORCE_ALIGNMENT= true # Set KRBVERS to "4" for Kerberos v4, "5" for Kerberos v5. # XXX Edit the default Kerberos variables below! # -#KRBVERS= 5 +#KRBVERS=5 # Globally pass Kerberos file locations. # these are used in the postmaster and all libpq applications. @@ -132,9 +132,9 @@ ENFORCE_ALIGNMENT= true # PG_KRB_SRVTAB is the location of the server's keytab file. # ifdef KRBVERS -KRBINCS= -I/usr/athena/include -KRBLIBS= -L/usr/athena/lib -KRBFLAGS+= $(KRBINCS) -DPG_KRB_SRVNAM='"postgres_dbms"' +KRBINCS= -I/usr/krb5/include +KRBLIBS= -L/usr/krb5/lib +KRBFLAGS+= $(KRBINCS) -DPG_KRB_SRVNAM='"postgres"' ifeq ($(KRBVERS), 4) KRBFLAGS+= -DKRB4 KRBFLAGS+= -DPG_KRB_SRVTAB='"/etc/srvtab"' @@ -142,8 +142,8 @@ KRBLIBS+= -lkrb -ldes else ifeq ($(KRBVERS), 5) KRBFLAGS+= -DKRB5 -KRBFLAGS+= -DPG_KRB_SRVTAB='"FILE:/krb5/srvtab.postgres"' -KRBLIBS+= -lkrb5 -lcrypto -lcom_err -lisode +KRBFLAGS+= -DPG_KRB_SRVTAB='"FILE:/usr/local/postgres/krb5.keytab"' +KRBLIBS+= -lkrb5 -lcrypto -lcom_err endif endif endif |