svn rev #19149: branches/krb5-1-6/ src/lib/krb5/krb/

[tlyu@MIT.EDU]

Commit By: tlyu
Log Message: 
ticket: 5420
version_fixed: 1.6.1

pull up r19131 from trunk

 r19131 at 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()
 
 




Changed Files:
_U  branches/krb5-1-6/
U   branches/krb5-1-6/src/lib/krb5/krb/get_in_tkt.c
U   branches/krb5-1-6/src/lib/krb5/krb/gic_opt.c