svn rev #19131: trunk/ src/lib/krb5/krb/

[tlyu@MIT.EDU]

Commit By: tlyu
Log Message: 
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()




Changed Files:
_U  trunk/
U   trunk/src/lib/krb5/krb/get_in_tkt.c
U   trunk/src/lib/krb5/krb/gic_opt.c