pull up r19746 from trunk, including manual merges
authorTom Yu <tlyu@mit.edu>
Tue, 18 Sep 2007 03:36:50 +0000 (03:36 +0000)
committerTom Yu <tlyu@mit.edu>
Tue, 18 Sep 2007 03:36:50 +0000 (03:36 +0000)
commit11ff32f3b07f89910d578ef8cb429917c6a36423
tree98e2be5bd6152b4399877ae28c40a68b047e2b14
parent0d7847ee2fbd19e7977f558b64381961e0c19328
pull up r19746 from trunk, including manual merges

 r19746@cathode-dark-space:  epeisach | 2007-08-02 22:36:26 -0400
 ticket: 5617

 Add internal prototype for krb5_preauth_supply_preauth_data(). Clean up
 some shadow variable warnings, make depend...

ticket: 5617

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19939 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/krb5/krb/Makefile.in
src/lib/krb5/krb/gic_opt.c
src/lib/krb5/krb/int-proto.h
src/lib/krb5/krb/preauth2.c