Support a new yes/no variable "KERBEROS_PREFIX_CMDS" that can be used by

Kerberos implementation packages to decide whether to prefix certain
commands with a "k" to differentiate it from system tools with similar
names.  KERBEROS_PREFIX_CMDS defaults to "no".

2 files changed, 30 insertions, 19 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index a6db6530aa0..f6245dd289c 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/11 00:00:28 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/15 12:48:00 jlam Exp $
 
 DISTNAME=		heimdal-0.6
 CATEGORIES=		security
@@ -40,18 +40,28 @@ USE_DB185=		yes
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 .include "../../security/openssl/buildlink3.mk"
 
-# XXX Using heimdal with an LDAP backend isn't supported yet.
+# XXX Using Heimdal with an LDAP backend isn't supported yet.
 #BUILD_DEFS+=		HEIMDAL_USE_LDAP
 #.if defined(HEIMDAL_USE_LDAP) && !empty(HEIMDAL_USE_LDAP:M[yY][eE][sS])
 #.  include "../../databases/openldap/buildlink3.mk"
 #CONFIGURE_ARGS+=	--with-openldap=${BUILDLINK_PREFIX.openldap}
 #.endif
 
-# Rename heimdal's ftp/ftpd to kftp/kftpd so we don't conflict with
-# net/tnftp and net/tnftpd.
+# Rename some of Heimdal's applications so they won't conflict with
+# other packages.
 #
-CONFIGURE_ARGS+=	--program-transform-name=${HEIMDAL_TRANSFORM}
-HEIMDAL_TRANSFORM=	"s/^ftp/kftp/"
+BUILD_DEFS+=	KERBEROS_PREFIX_CMDS
+.if !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS])
+HEIMDAL_TRANSFORM=	s/^ftp/k&/;					\
+			s/^login/k&/;s/^klogin.access/login.access/;	\
+			s/^rcp/k&/;s/^rsh/k&/;				\
+			s/^su/k&/;s/^telnet/k&/
+PLIST_SUBST+=		KRB5_PREFIX=k
+.else
+HEIMDAL_TRANSFORM=	s/^ftp/k&/
+PLIST_SUBST+=		KRB5_PREFIX=
+.endif
+CONFIGURE_ARGS+=	--program-transform-name="${HEIMDAL_TRANSFORM}"
 
 USE_PKGINSTALL=		yes
 OWN_DIRS_PERMS=		${HEIMDAL_STATEDIR} ${ROOT_USER} ${ROOT_GROUP} 0700
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index 5fd0a022d2f..6315223745a 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/10 14:56:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/01/15 12:48:00 jlam Exp $
 bin/afslog
 bin/compile_et
 bin/kauth
@@ -10,18 +10,19 @@ bin/kinit
 bin/klist
 bin/kpasswd
 bin/krb5-config
-bin/login
+bin/${KRB5_PREFIX}login
 bin/mk_cmds
 bin/otp
 bin/otpprint
 bin/pagsh
 bin/pfrom
-bin/rcp
-bin/rsh
+bin/${KRB5_PREFIX}rcp
+bin/${KRB5_PREFIX}rsh
 bin/string2key
-bin/su
-bin/telnet
+bin/${KRB5_PREFIX}su
+bin/${KRB5_PREFIX}telnet
 bin/verify_krb5_conf
+etc/rc.d/kdc
 include/krb5/asn1_err.h
 include/krb5/base64.h
 include/krb5/com_err.h
@@ -137,8 +138,8 @@ libexec/kftpd
 libexec/kpasswdd
 libexec/popper
 libexec/push
-libexec/rshd
-libexec/telnetd
+libexec/${KRB5_PREFIX}rshd
+libexec/${KRB5_PREFIX}telnetd
 man/man1/afslog.1
 man/man1/kauth.1
 man/man1/kdestroy.1
@@ -150,14 +151,14 @@ man/man1/klist.1
 man/man1/kpasswd.1
 man/man1/krb5-config.1
 man/man1/kx.1
-man/man1/login.1
+man/man1/${KRB5_PREFIX}login.1
 man/man1/otp.1
 man/man1/otpprint.1
 man/man1/pfrom.1
-man/man1/rsh.1
+man/man1/${KRB5_PREFIX}rsh.1
 man/man1/rxtelnet.1
 man/man1/rxterm.1
-man/man1/telnet.1
+man/man1/${KRB5_PREFIX}telnet.1
 man/man1/tenletxr.1
 man/man1/xnlock.1
 man/man3/arg_printusage.3
@@ -430,9 +431,9 @@ man/man8/ktutil.8
 man/man8/kxd.8
 man/man8/popper.8
 man/man8/push.8
-man/man8/rshd.8
+man/man8/${KRB5_PREFIX}rshd.8
 man/man8/string2key.8
-man/man8/telnetd.8
+man/man8/${KRB5_PREFIX}telnetd.8
 man/man8/verify_krb5_conf.8
 sbin/dump_log
 sbin/kadmin