summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2003-07-23 08:01:24 +0000
committeritojun <itojun@NetBSD.org>2003-07-23 08:01:24 +0000
commite63468d8cc1c252caadaca025d4e9da297de3b80 (patch)
tree718c9855ab67afe7e7fa81f21d3518aab3ae63b3 /libexec
parent0abe0bddb0cc852e759806b961e6e032303f6931 (diff)
split MKKERBEROS4 from MKKERBEROS. based on work by lha at stacken.kth.se
(build confirmed with both MKKERBEROS4=yes and MKKERBEROS4=no)
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ftpd/Makefile27
-rw-r--r--libexec/hpropd/Makefile16
-rw-r--r--libexec/kadmind/Makefile19
-rw-r--r--libexec/telnetd/Makefile21
4 files changed, 57 insertions, 26 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index cc35160d080..1acab8c17a3 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2002/09/18 06:24:34 lukem Exp $
+# $NetBSD: Makefile,v 1.51 2003/07/23 08:01:27 itojun Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
.include <bsd.own.mk>
@@ -28,19 +28,24 @@ LDADD+= -lskey
ftpd.o ftpcmd.o: version.h
-# XXX Kerberos support is broken right now.
+#.if (${USE_KERBEROS} != "no")
+#
#.PATH: ${NETBSDSRCDIR}/usr.bin/login
-
-#.ifdef KERBEROS5
+#
#SRCS+= k5login.c
#CPPFLAGS+=-DKERBEROS5
-#DPADD+= ${LIBKRB5} ${LIBK5CRYPTO} ${LIBCOM_ERR}
-#LDADD+= -lkrb5 -lk5crypto -lcom_err
-#.else
-#SRCS+= klogin.c
-#CPPFLAGS+=-DKERBEROS
-#DPADD+= ${LIBKRB} ${LIBDES} ${LIBCOM_ERR}
-#LDADD+= -lkrb -kdes -lcom_err
+#CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+#DPADD+= ${LIBKRB5} ${LIBASN1}
+#LDADD+= -lkrb5 -lasn1
+#
+#SRCS+= klogin.c
+#CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV
+#DPADD+= ${LIBKRB}
+#LDADD+= -lkrb
+#
+#DPADD+= ${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
+#LDADD+= -lcrypto -lroken -lcom_err
+#
#.endif
.include <bsd.prog.mk>
diff --git a/libexec/hpropd/Makefile b/libexec/hpropd/Makefile
index 80ab4476aac..aa0973d9278 100644
--- a/libexec/hpropd/Makefile
+++ b/libexec/hpropd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/10/23 01:15:57 itojun Exp $
+# $NetBSD: Makefile,v 1.11 2003/07/23 08:01:28 itojun Exp $
NOLINT= # defined
@@ -12,22 +12,28 @@ WARNS?= 1
PROG= hpropd
MAN= hpropd.8
+.if ${MKKERBEROS4} != "no"
+CPPFLAGS+= -DKRB4
+CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
+KRB4LDADD= -lkdb -lkrb
+KRB4DPADD= ${LIBKDB} ${LIBKRB}
+.endif
+
CPPFLAGS+= -I. \
-I${DIST}/heimdal/kdc \
-I${NETBSDSRCDIR}/include/heimdal \
-I${DIST}/heimdal/lib/asn1 \
-I${DIST}/heimdal/lib/krb5 \
- -I${DESTDIR}/usr/include/kerberosIV \
-I${DESTDIR}/usr/include/krb5 \
-DHAVE_CONFIG_H
VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
-LDADD+= -lhdb -lkrb5 -lkdb -lkrb -lcrypto \
+LDADD+= -lhdb -lkrb5 ${KRB4LDADD} -lcrypto \
-lasn1 -lcom_err -L${VERS} -lvers -lroken \
-lcrypt
-DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBCRYPTO} \
+DPADD+= ${LIBHDB} ${LIBKRB5} ${KRB4DPADD} ${LIBCRYPTO} \
${LIBASN1} ${LIBCOM_ERR} ${VERS}/libvers.a ${LIBROKEN} \
- ${LIBCRYPT
+ ${LIBCRYPT}
.include <bsd.prog.mk>
diff --git a/libexec/kadmind/Makefile b/libexec/kadmind/Makefile
index 6e704e824df..2557806c4bb 100644
--- a/libexec/kadmind/Makefile
+++ b/libexec/kadmind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/23 01:04:25 itojun Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/23 08:01:29 itojun Exp $
NOLINT= # defined
@@ -12,9 +12,17 @@ WARNS?= 1
PROG= kadmind
MAN= kadmind.8
-SRCS= kadmind.c \
+.if ${MKKERBEROS4} != "no"
+CPPFLAGS+= -DKRB4
+CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
+SRCS+= version4.c
+
+KRB4LDADD= -lkadm -lkrb
+KRB4DPADD= ${LIBKADM} ${LIBKRB}
+.endif
+
+SRCS+= kadmind.c \
server.c \
- version4.c \
kadm_conn.c
CPPFLAGS+= -I. \
@@ -23,16 +31,15 @@ CPPFLAGS+= -I. \
-I${DIST}/heimdal/lib/asn1 \
-I${NETBSDSRCDIR}/include/heimdal \
-I${DESTDIR}/usr/include/kadm5 \
- -I${DESTDIR}/usr/include/kerberosIV \
-I${DESTDIR}/usr/include/krb5 \
-DHAVE_CONFIG_H
VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
-LDADD+= -lkadm5srv -lhdb -lkrb5 -lkadm -lkrb \
+LDADD+= -lkadm5srv -lhdb -lkrb5 ${KRB4LDADD} \
-lcrypto -lasn1 -lcom_err -L${VERS} -lvers \
-lroken -lcrypt -lutil
-DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBKADM} ${LIBKRB} \
+DPADD+= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${KRB4DPADD} \
${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${VERS}/libvers.a \
${LIBROKEN} ${LIBCRYPT} ${LIBUTIL}
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index a6f891aa220..b9b31e3573c 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2003/07/16 05:42:04 itojun Exp $
+# $NetBSD: Makefile,v 1.36 2003/07/23 08:01:30 itojun Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
.include <bsd.own.mk>
@@ -18,15 +18,28 @@ CPPFLAGS+=-I${.CURDIR}
LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
-.if (${USE_KERBEROS} != "no")
+.if (${USE_KERBEROS4} != "no" || ${USE_KERBEROS} != "no")
CPPFLAGS+=-DAUTHENTICATION -DENCRYPTION
+
+.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
CPPFLAGS+=-DKRB5
+LDADD+= -lkrb5
+DPADD+= ${LIBKRB5}
+.endif
+
+.if (${USE_KERBEROS4} != "no")
+CPPFLAGS+=-DKRB4
+LDADD+= -lkrb
+DPADD+= ${LIBKRB}
+.endif
+
VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
-LDADD+= -lkrb5 -lkrb -lcrypto -lasn1 -lcom_err -L${VERS} -lvers -lroken
-DPADD+= ${LIBKRB5} ${LIBKRB} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+= -lcrypto -lasn1 -lcom_err -L${VERS} -lvers -lroken
+DPADD+= ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+
.endif
.include <bsd.prog.mk>