OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_1-239-gcc0ffc5

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit cc0ffc56e85eec4133bcc5e745efa28f5d3c53a7
Author: Cheyenne Wills <cwills@sinenomine.net>
Date:   Mon Sep 19 16:25:13 2022 -0600

    UKERNEL: avoid double include of roken.h
    
    Commit 'afs: Replace strcpy &co by safer alternatives' (419f0cd7aa75719)
    added an include for roken.h into UKERNEL/afsincludes.h.  Neither
    UKERNEL/afsincludes.h or roken.h has a guard against a double include,
    which can result in a build failure on older kernels (discovered on a
    2.6.18 build):
    
     In file included from ~/openafs/src/afs/UKERNEL/afsincludes.h:30,
              from ~/openafs/src/afs/UKERNEL/afs_usrops.h:15,
              from ~/openafs/src/afs/UKERNEL/afs_usrops.c:24:
     include/roken.h:89: error: redefinition of typedef 'rk_socket_t'
     include/roken.h:89: error: previous declaration of 'rk_socket_t' was here
     In file included from ~/openafs/src/afs/UKERNEL/afsincludes.h:30,
              from ../afs/afsincludes.h:16,
              from ../afs/afs_bypasscache.h:68,
              from ~/openafs/src/afs/UKERNEL/afs_usrops.c:30:
    
    Since roken.h is from an external source, we cannot update it to add
    the necessary check.
    
    Update UKERNEL/afsincludes.h to add a check to see if it has already
    been included.
    
    auth/ktc.c has a required include for roken.h, but it also can pull in
    UKERNEL/afsincludes.h as well.  This can result in a double include for
    roken.h.
    
    Update auth/ktc.c to only include roken.h if not building UKERNEL.
    
    Change-Id: I192443006f6c2257de57b35a6580b1df358c011c
    Reviewed-on: https://gerrit.openafs.org/15130
    Reviewed-by: Andrew Deason <adeason@sinenomine.net>
    Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

 src/afs/UKERNEL/afsincludes.h | 5 +++++
 src/auth/ktc.c                | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

-- 
OpenAFS Master Repository