pull up r19131 from trunk
authorTom Yu <tlyu@mit.edu>
Mon, 5 Feb 2007 23:45:17 +0000 (23:45 +0000)
committerTom Yu <tlyu@mit.edu>
Mon, 5 Feb 2007 23:45:17 +0000 (23:45 +0000)
commit468963455d632cdb8faf36df24266989e5db5dc2
tree65fb809a2bde57ef62f1fc3693debf8922345fde
parent9a63e8d3ae46d0efd69239640c2a5adafeccbeb3
pull up r19131 from trunk

 r19131@cathode-dark-space:  tlyu | 2007-01-30 19:53:11 -0500
 ticket: 5420
 status: open

 Fix merge botches:

 restore krb5_get_init_creds_opt_set_change_password_prompt()

 undo accidental reversion of preauth_tryagain change to
 krb5_get_init_creds()

ticket: 5420
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19149 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/krb5/krb/get_in_tkt.c
src/lib/krb5/krb/gic_opt.c