pull up r23928 from trunk
authorTom Yu <tlyu@mit.edu>
Wed, 19 May 2010 18:52:39 +0000 (18:52 +0000)
committerTom Yu <tlyu@mit.edu>
Wed, 19 May 2010 18:52:39 +0000 (18:52 +0000)
commitcc6d0c93fdd66886fce3fc4321e3d57bdf24887d
tree9e2ca3ed6772fbaf19f4b68adf03988a088a09b8
parent83e30ba0f4d111a1b64b079ac7b8bb481c2e6b21
pull up r23928 from trunk

 ------------------------------------------------------------------------
 r23928 | tlyu | 2010-04-22 21:10:20 -0400 (Thu, 22 Apr 2010) | 10 lines

 ticket: 6698
 target_version: 1.8.2
 tags: pullup

 Adapted patch from Jason Rogers.  It wasn't complete, so this commit
 fixes the other instances of the 64-bit problem.

 Also fix krb5_deltat_to_str(), which would previously always return an
 empty string.

ticket: 6698
version_fixed: 1.8.2
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@24059 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/krb5/krb/str_conv.c
src/slave/kproplog.c