OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_61-7-gc3c8a3e
Gerrit Code Review
gerrit@openafs.org
Wed, 5 Aug 2009 21:01:05 -0700 (PDT)
The following commit has been merged in the master branch:
commit c3c8a3e2f912855addc2c430f909bdce912e3670
Author: Marc Dionne <marc.c.dionne@gmail.com>
Date: Mon Jul 27 14:24:15 2009 -0400
kauth warning reduction
Warning removal for various functions that manipulates keys and use
several data types interchangeably.
Inline helpers are introduced to convert between the types and are
used when making function calls to target the appropriate type:
des_prototypes.h
cblockptr_to_cblock: des_cblock * to des_cblock
charptr_to_cblock: char * to des_cblock
charptr_to_cblockptr: char * to des_cblock *
rxkad_prototypes.h
ktc_to_cblock: struct ktc_encryptionKey * to des_cblock
ktc_to_cblockptr: struct ktc_encryptionKey * to des_cblock *
kauth_internal.h
EncryptionKey_to_cblock: EncryptionKey * to des_cblock
EncryptionKey_to_ktc: EncryptionKey * to struct ktc_encryptionKey *
ktc_to_EncryptionKey: struct ktc_encryptionKey * to EncryptionKey *
- parameters are adjusted for tkt_DecodeTicket(5), replacing the char *
key with struct ktc_encryptionKey, to match usage
- the get_key function is changed to have a void * parameter, to match
usage
- rxkad_prototypes.h includes des.h to get the des_cblock definition.
This causes conflicts for a few files where the kerberos headers are
also included - aklog/aklog_main.c and WINNT/afsd/afskfw.c
Use NO_DES_H_INCLUDE in thoses cases to skip the new parts of
rxkad_prototypes.h
Reviewed-on: http://gerrit.openafs.org/234
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Makefile.in | 2 +-
src/WINNT/afsd/afskfw.c | 3 ++
src/aklog/aklog_main.c | 4 +++
src/auth/authcon.c | 6 +---
src/bozo/bos_util.c | 3 +-
src/des/des_prototypes.h | 15 ++++++++++
src/des/strng_to_key.c | 8 +++---
src/kauth/admin_tools.c | 5 ++-
src/kauth/authclient.c | 17 +++++++-----
src/kauth/client.c | 14 +++++----
src/kauth/kaprocs.c | 62 +++++++++++++++++++++---------------------
src/kauth/kauth_internal.h | 15 ++++++++++
src/kauth/kautils.c | 4 +-
src/kauth/kpasswd.c | 8 +++---
src/kauth/krb_udp.c | 15 +++++-----
src/kauth/read_passwd.c | 3 +-
src/kauth/rebuild.c | 5 ++-
src/kauth/user.c | 10 +++---
src/rxkad/rxkad_prototypes.h | 24 ++++++++++++++--
src/rxkad/ticket.c | 19 +++++++-----
src/rxkad/ticket5.c | 14 ++++++---
21 files changed, 162 insertions(+), 94 deletions(-)
--
OpenAFS Master Repository