From 159d09a20817016f09b3ea28d1bdada4a336bb91 Mon Sep 17 00:00:00 2001
From: Mark Phalan <Mark.Phalan@Sun.COM>
Date: Fri, 24 Oct 2008 01:34:59 -0700
Subject: PSARC/2008/631 Kerberos PKINIT PSARC/2008/358 removal of kadm5.keytab
 6698059 Resync with mit 1.6.3 (pkinit) 6749302 pam_krb5 auth fails with key
 table entry not found

---
 usr/src/cmd/krb5/kadmin/cli/kadmin.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'usr/src/cmd/krb5/kadmin/cli/kadmin.c')

diff --git a/usr/src/cmd/krb5/kadmin/cli/kadmin.c b/usr/src/cmd/krb5/kadmin/cli/kadmin.c
index 43ddd4b052..ab086d6eef 100644
--- a/usr/src/cmd/krb5/kadmin/cli/kadmin.c
+++ b/usr/src/cmd/krb5/kadmin/cli/kadmin.c
@@ -1,9 +1,8 @@
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Copyright 1994 by the Massachusetts Institute of Technology.
@@ -32,7 +31,6 @@
  * the OVSecure library
  */
 
-#include <krb5.h>
 #include <kadm5/admin.h>
 #include <krb5/adm_proto.h>
 #include <stdio.h>
@@ -45,6 +43,7 @@
 #include <time.h>
 #include "kadmin.h"
 #include <libintl.h>
+#include <krb5.h>
 
 /*
  * Solaris:  the following are needed for paging
@@ -571,10 +570,11 @@ char *kadmin_startup(argc, argv)
 
     /* register the WRFILE keytab type and set it as the default */
     {
-	 /* XXX krb5_defkeyname is an internal library global and
-            should go away */
-	 extern char *krb5_defkeyname;
-	 krb5_defkeyname = DEFAULT_KEYTAB;
+#define DEFAULT_KEYTAB "WRFILE:/etc/krb5/krb5.keytab"
+	/* XXX krb5_defkeyname is an internal library global and
+	   should go away */
+	extern char *krb5_defkeyname;
+	krb5_defkeyname = DEFAULT_KEYTAB;
     }
     
     if ((retval = kadm5_init_iprop(handle)) != 0) {
-- 
cgit v1.2.3