OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-945-gc019e03
Gerrit Code Review
gerrit@openafs.org
Sat, 26 Mar 2011 22:18:57 -0700 (PDT)
The following commit has been merged in the master branch:
commit c019e03e70e95258da1af40d96d9798db1b8b2d2
Author: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri Mar 25 17:34:51 2011 +0000
crypto: Fixes for recent Heimdal changes
The last Heimdal import changed the name of a number of structures
so that they are private to the krb5 code. Mirror this by changing our
prototypes to match the new names.
This solves the key_type problem that we previously fixed by #defining
key_type to hc_key_type, so remove that define.
Change-Id: I9b3f1712b0bf6641a780cc4002e73f8a511ff080
Reviewed-on: http://gerrit.openafs.org/4340
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
src/crypto/hcrypto/kernel/config.h | 4 ----
src/crypto/rfc3961/kernel/algs.c | 4 ++--
src/crypto/rfc3961/krb5_locl.h | 24 +++++++++++++-----------
3 files changed, 15 insertions(+), 17 deletions(-)
--
OpenAFS Master Repository