summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-05-05 07:58:44 +0000
committermarkm <markm@FreeBSD.org>2003-05-05 07:58:44 +0000
commitee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003 (patch)
tree56d309156db9452465ff78724b6b4c3a6e0cbcba /lib
parenta7d933895cee5d8535b76f436f05f14decfd5967 (diff)
downloadFreeBSD-src-ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003.zip
FreeBSD-src-ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003.tar.gz
Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code was syntax checked, not run checked.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile2
-rw-r--r--lib/libpam/modules/modules.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 9ada362..7312a9e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -80,7 +80,7 @@ _libdisk= libdisk
.if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
defined(NOCRYPT) || defined(NO_OPENSSL) || \
- (defined(NOSECURE) && !defined(MAKE_KERBEROS5))
+ (defined(NOSECURE) && defined(NO_KERBEROS))
_libtelnet= libtelnet
.endif
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index 69899df..3a54d3c 100644
--- a/lib/libpam/modules/modules.inc
+++ b/lib/libpam/modules/modules.inc
@@ -8,7 +8,7 @@ MODULES += pam_exec
MODULES += pam_ftp
MODULES += pam_ftpusers
MODULES += pam_group
-.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
MODULES += pam_krb5
MODULES += pam_ksu
.endif
OpenPOWER on IntegriCloud