From 20a83c49ba9f6075b78edc70c3e2e3624d8ad361 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Wed, 30 Apr 2003 20:58:49 +0000
Subject: [PATCH] Make the defaults for Kerberos 5 a little more up-to-date.

---
 etc/Makefile         |  2 +-
 etc/defaults/rc.conf |  3 ++-
 etc/rc.d/kpasswdd    | 21 +++++++++++++++++++++
 etc/root/dot.k5login |  4 ++++
 etc/root/dot.klogin  |  4 ----
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 etc/rc.d/kpasswdd
 create mode 100644 etc/root/dot.k5login
 delete mode 100644 etc/root/dot.klogin

diff --git a/etc/Makefile b/etc/Makefile
index e3803d21250b..e2020c3b451a 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -99,7 +99,7 @@ distribution:
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.cshrc ${DESTDIR}/root/.cshrc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-		dot.klogin ${DESTDIR}/root/.klogin; \
+		dot.k5login ${DESTDIR}/root/.k5login; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.login ${DESTDIR}/root/.login; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 563c6806f023..66ac0afcb4c2 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -154,7 +154,8 @@ kerberos5_server_enable="NO"	# Run a kerberos 5 master server (or NO).
 kerberos5_server="/usr/libexec/kdc"	# path to kerberos 5 KDC
 kadmind5_server_enable="NO"	# Run kadmind (or NO)
 kadmind5_server="/usr/libexec/kadmind"	# path to kerberos 5 admin daemon
-kerberos_stash="NO"		# Is the kerberos master key stashed?
+kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
+kpasswdd_server="/usr/libexec/kpasswdd"	# path to kerberos 5 passwd daemon
 
 rwhod_enable="NO"		# Run the rwho daemon (or NO).
 rwhod_flags=""			# Flags for rwhod
diff --git a/etc/rc.d/kpasswdd b/etc/rc.d/kpasswdd
new file mode 100644
index 000000000000..d16f25faf8f8
--- /dev/null
+++ b/etc/rc.d/kpasswdd
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: kpasswdd
+# REQUIRE: kadmind5
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD
+
+. /etc/rc.subr
+
+name="kpasswdd"
+load_rc_config $name
+rcvar="kpasswdd_server_enable"
+unset start_cmd
+command="${kpasswdd_server}"
+command_args="&"
+required_vars="kadmind5_server_enable"
+
+run_rc_command "$1"
diff --git a/etc/root/dot.k5login b/etc/root/dot.k5login
new file mode 100644
index 000000000000..e01b9417fdbe
--- /dev/null
+++ b/etc/root/dot.k5login
@@ -0,0 +1,4 @@
+# $FreeBSD$
+#
+# user1/root@YOUR.REALM.WHEREVER
+# user2/root@YOUR.REALM.WHEREVER
diff --git a/etc/root/dot.klogin b/etc/root/dot.klogin
deleted file mode 100644
index 55e653a13323..000000000000
--- a/etc/root/dot.klogin
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-#
-# user1.root@your.realm.wherever
-# user2.root@your.realm.wherever