Fix merge botches:
authorTom Yu <tlyu@mit.edu>
Wed, 31 Jan 2007 00:53:11 +0000 (00:53 +0000)
committerTom Yu <tlyu@mit.edu>
Wed, 31 Jan 2007 00:53:11 +0000 (00:53 +0000)
commit7c225b931d85a61928cb6dfbff2e54801086990e
tree84efad3d19568cdbb5ae4d72f9011ec8f5fc9264
parenta633bc0799f01a73297d3800b752c39db60c797b
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
status: open

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