3 files changed, 18 insertions, 11 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 9c28f25e1d..3f8f2ec48e 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -3,6 +3,16 @@ Tue Dec  3 15:39:11 1996  Barry Jaspan  <bjaspan@mit.edu>
 	* kadmin.c (kadmin_addprinc): print warning/notice about no policy
  	and default policy [krb5-admin/252]
 
+Thu Dec  5 19:30:22 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kadmin.M: Missed a ref to /krb5. [279]
+	
+	* kadmin.M: Change example to no longer use /krb5. [PR 279]
+
+	* kadmin.M: v5srvtab -> krb5.keytab [PR 279]
+
+	* kadmin.c (DEFAULT_KEYTAB): v5srvtab -> krb5.keytab [PR 278]
+
 Wed Nov 13 14:29:02 1996  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in (clean-unix): Remove getdate.c and kadmin_ct.c.
diff --git a/src/kadmin/cli/kadmin.M b/src/kadmin/cli/kadmin.M
index f0f8913f15..a74874ff96 100644
--- a/src/kadmin/cli/kadmin.M
+++ b/src/kadmin/cli/kadmin.M
@@ -676,7 +676,7 @@ is added, ignoring multiple keys with the same encryption type but
 different salt types.  If the
 .B \-k
 argument is not specified, the default keytab
-.I /etc/v5srvtab
+.I /etc/krb5.keytab
 is used.  If the
 .B \-q
 option is specified, less verbose status information is displayed.
@@ -695,13 +695,10 @@ command.
 .RS
 .TP
 EXAMPLE:
-kadmin: ktadd -k /krb5/kadmind.keytab kadmin/admin kadmin/changepw
-Entry for principal kadmin/admin@ATHENA.MIT.EDU with
+kadmin: ktadd -k /tmp/foo-new-keytab host/foo.mit.edu
+Entry for principal host/foo.mit.edu@ATHENA.MIT.EDU with
 	kvno 3, encryption type DES-CBC-CRC added to keytab
-	WRFILE:/krb5/kadmind.keytab.
-Entry for principal kadmin/changepw@ATHENA.MIT.EDU
-	with kvno 3, encryption type DES-CBC-CRC added to keytab
-	WRFILE:/krb5/kadmind.keytab.
+	WRFILE:/tmp/foo-new-keytab
 kadmin:
 .RE
 .fi
@@ -716,7 +713,7 @@ parsed as an integer, and all entries whose kvno match that integer are
 removed.  If the
 .B \-k
 argument is not specifeid, the default keytab
-.I /etc/v5srvtab
+.I /etc/krb5.keytab
 is used.  If the
 .B \-q
 option is specified, less verbose status information is displayed.
@@ -725,9 +722,9 @@ option is specified, less verbose status information is displayed.
 .RS
 .TP
 EXAMPLE:
-kadmin: ktremove -k /krb5/kadmind.keytab kadmin/admin
+kadmin: ktremove -k /usr/local/var/krb5kdc/kadmind.keytab kadmin/admin
 Entry for principal kadmin/admin with kvno 3 removed
-	from keytab WRFILE:/krb5/kadmind.keytab.
+	from keytab WRFILE:/usr/local/var/krb5kdc/kadmind.keytab.
 kadmin:
 .RE
 .fi
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index a684a2e58a..b881681d24 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -428,7 +428,7 @@ char *kadmin_startup(argc, argv)
 	 exit(1);
     }
     {
-#define DEFAULT_KEYTAB "WRFILE:/etc/v5srvtab"
+#define DEFAULT_KEYTAB "WRFILE:/etc/krb5.keytab"
 	 /* XXX krb5_defkeyname is an internal library global and
             should go away */
 	 extern char *krb5_defkeyname;