summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/krb5/kadm5/srv/chgpwd.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/usr/src/lib/krb5/kadm5/srv/chgpwd.c b/usr/src/lib/krb5/kadm5/srv/chgpwd.c
index 020326fb25..72a3be609a 100644
--- a/usr/src/lib/krb5/kadm5/srv/chgpwd.c
+++ b/usr/src/lib/krb5/kadm5/srv/chgpwd.c
@@ -1,10 +1,8 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* lib/krb5/kadm5/srv/chgpwd.c
*
@@ -591,7 +589,13 @@ handle_chpw(krb5_context context, int s1,
return;
}
- if ((ret = krb5_kt_resolve(context, params->admin_keytab, &kt))) {
+ /*
+ * Solaris Kerberos:
+ * The only caller is kadmind, which is the master and therefore has the
+ * correct keys in the KDB, rather than obtaining them via the
+ * kadm5.keytab, by default.
+ */
+ if ((ret = krb5_kt_resolve(context, "KDB:", &kt))) {
krb5_klog_syslog(LOG_ERR, gettext("chpw: Couldn't open "
"admin keytab %s"), error_message(ret));
return;