Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: binary
MIME-Version: 1.0
X-Mailer: MIME-tools 5.411 (Entity 5.404)
From: tlyu@mit.edu
Subject: SVN Commit
RT-Send-CC:
X-RT-Original-Encoding: iso-8859-1
Content-Length: 465

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


Commit By: tlyu



Revision: 19149
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