OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_1-555-g03f9b08

Gerrit Code Review gerrit@openafs.org
Fri, 18 Oct 2024 15:18:54 -0400


The following commit has been merged in the master branch:
commit 03f9b08e90180d5cb41a8e457f450dc1c244bc53
Author: Cheyenne Wills <cwills@sinenomine.net>
Date:   Fri Oct 18 11:29:00 2024 -0600

    rxkad: rename ENCRYPT macro to FCRYPT_ENCRYPT
    
    rxkad/fcrypt defines 2 macros: ENCRYPT and DECRYPT.  The names are
    pretty generic and do not clearly associate with fcrypt.
    
    In addition, the name ENCRYPT collide with the Microsoft provided header
    'ntddndis.h' that uses ENCRYPT as an ENUM (on newer versions of the
    Windows development kits):
    
        typedef enum    _OFFLOAD_OPERATION_E
        {
            AUTHENTICATE = 1,
            ENCRYPT
        }
    
    This results in a build error on Windows when fcrypt.h is included with
    ntddndis.h:
        ... ntddndis.h(2212): error C2059: syntax error: 'constant'
    
    Rename the ENCRYPT/DECRYPT macros to FCRYPT_ENCRYPT/FCRYPT_DECRYPT in
    fcrypt.h to a name that relates the macros back to fcrypt.
    
    Note: The ENCRYPT/DECRYPT symbols are part of a public interface
    installed in fcrypt.h, but keeping the old names are impractical, so we
    are changing them anyway.
    
    Change-Id: I9c51c81fab7fcbf0dae01569852ca94c0e6a0439
    Reviewed-on: https://gerrit.openafs.org/15868
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
    Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

 src/kauth/authclient.c   |  8 ++++----
 src/kauth/kaprocs.c      | 12 ++++++------
 src/kauth/kautils.c      |  2 +-
 src/kauth/krb_udp.c      |  4 ++--
 src/rxkad/bg-fcrypt.c    | 16 ++++++++--------
 src/rxkad/crypt_conn.c   |  4 ++--
 src/rxkad/fcrypt.c       |  4 ++--
 src/rxkad/fcrypt.h       |  6 +++---
 src/rxkad/rxkad_client.c |  4 ++--
 src/rxkad/rxkad_common.c |  8 ++++----
 src/rxkad/rxkad_server.c |  6 +++---
 src/rxkad/stats.h        |  4 ++--
 src/rxkad/tcrypt.c       |  4 ++--
 src/rxkad/test/fc_test.c | 20 ++++++++++----------
 src/rxkad/ticket.c       |  4 ++--
 15 files changed, 53 insertions(+), 53 deletions(-)

-- 
OpenAFS Master Repository