pull up r20558 from trunk
authorTom Yu <tlyu@mit.edu>
Fri, 25 Jul 2008 21:07:57 +0000 (21:07 +0000)
committerTom Yu <tlyu@mit.edu>
Fri, 25 Jul 2008 21:07:57 +0000 (21:07 +0000)
commit4f188c4c07602116d3d744f88201bee2654123d4
treee67c38f00a22e421dbba022486a14f7cd605a8ab
parente94b402cd9e122f29da303e071680c25a0e0406a
pull up r20558 from trunk

 r20558@cathode-dark-space:  jaltman | 2008-07-21 16:33:53 -0400
 ticket: 5840
 tags: pullup

 kadm5_decrypt_key(). This patch prevents the returned keyblock's
 enctype from being coerced to the requested 'ktype' if the requested
 'ktype' == -1. A ktype of -1 is documented as meaning "to be ignored".

ticket: 5840
version_fixed: 1.6.4
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20584 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/kadm5/srv/svr_principal.c