summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Emery <Shawn.Emery@Sun.COM>2010-06-07 01:47:20 -0600
committerShawn Emery <Shawn.Emery@Sun.COM>2010-06-07 01:47:20 -0600
commite1831dbbc9b53f41c2e0cb00c93047e5852ab3c7 (patch)
tree82c922e139c1789bfdb9a540de5e67a4ba48010a
parent4a344fefc11f3e4396164d49b41397979db382c2 (diff)
downloadillumos-gate-e1831dbbc9b53f41c2e0cb00c93047e5852ab3c7.tar.gz
6944375 No principal in keytab matches desired name
-rw-r--r--usr/src/cmd/krb5/kadmin/kclient/kclient.sh53
1 files changed, 14 insertions, 39 deletions
diff --git a/usr/src/cmd/krb5/kadmin/kclient/kclient.sh b/usr/src/cmd/krb5/kadmin/kclient/kclient.sh
index 0599464da3..c9e3384fb4 100644
--- a/usr/src/cmd/krb5/kadmin/kclient/kclient.sh
+++ b/usr/src/cmd/krb5/kadmin/kclient/kclient.sh
@@ -1529,47 +1529,22 @@ EOF
#
salt=host/${locase_nodename}.${domain}@${realm}
- printf "%s" "$newpw" | $KSETPW -n -s $salt -v $kvno -k "$new_keytab" "${args[@]}" host/${fqdn}@${realm} > /dev/null 2>&1
- if [[ $? -ne 0 ]]
- then
- printf "$(gettext "Failed to set account password").\n" >&2
- error_message
- fi
+ skeys=(host/${fqdn}@${realm} nfs/${fqdn}@${realm} HTTP/${fqdn}@${realm})
+ skeys+=(root/${fqdn}@${realm} cifs/${fqdn}@${realm})
+ skeys+=(${netbios_nodename}@${realm} host/${upcase_nodename}@${realm})
+ skeys+=(cifs/${upcase_nodename}@${realm})
- printf "%s" "$newpw" | $KSETPW -n -s $salt -v $kvno -k "$new_keytab" "${args[@]}" nfs/${fqdn}@${realm} > /dev/null 2>&1
- if [[ $? -ne 0 ]]
- then
- printf "$(gettext "Failed to set account password").\n" >&2
- error_message
- fi
+ ks_args="-n -s $salt -v $kvno -k $new_keytab ${args[@]}"
- printf "%s" "$newpw" | $KSETPW -n -s $salt -v $kvno -k "$new_keytab" "${args[@]}" HTTP/${fqdn}@${realm} > /dev/null 2>&1
- if [[ $? -ne 0 ]]
- then
- printf "$(gettext "Failed to set account password").\n" >&2
- error_message
- fi
-
- printf "%s" "$newpw" | $KSETPW -n -s $salt -v $kvno -k "$new_keytab" "${args[@]}" root/${fqdn}@${realm} > /dev/null 2>&1
- if [[ $? -ne 0 ]]
- then
- printf "$(gettext "Failed to set account password").\n" >&2
- error_message
- fi
-
- printf "%s" "$newpw" | $KSETPW -n -s $salt -v $kvno -k "$new_keytab" "${args[@]}" cifs/${fqdn}@${realm} > /dev/null 2>&1
- if [[ $? -ne 0 ]]
- then
- printf "$(gettext "Failed to set account password").\n" >&2
- error_message
- fi
-
- printf "%s" "$newpw" | $KSETPW -n -s $salt -v $kvno -k "$new_keytab" "${args[@]}" ${netbios_nodename}@${realm} > /dev/null 2>&1
- if [[ $? -ne 0 ]]
- then
- printf "$(gettext "Failed to set account password").\n" >&2
- error_message
- fi
+ for skey in ${skeys[@]}
+ do
+ printf "%s" "$newpw" | $KSETPW $ks_args $skey > /dev/null 2>&1
+ if [[ $? -ne 0 ]]
+ then
+ printf "$(gettext "Failed to set password").\n" >&2
+ error_message
+ fi
+ done
doKRB5config