The following commit has been merged in the openafs-stable-1_8_x branch:
commit a0898c2d90ed2928245576505f74e935a1ea2722
Author: Cheyenne Wills <[email protected]>
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.
Reviewed-on: https://gerrit.openafs.org/15130
Reviewed-by: Andrew Deason <[email protected]>
Reviewed-by: Michael Meffie <[email protected]>
Tested-by: BuildBot <[email protected]>
Reviewed-by: Benjamin Kaduk <[email protected]>
(cherry picked from commit cc0ffc56e85eec4133bcc5e745efa28f5d3c53a7)
Change-Id: I4508c2d4bb878dadce649f0da2af16c9efa69b91
Reviewed-on: https://gerrit.openafs.org/15265
Reviewed-by: Michael Meffie <[email protected]>
Tested-by: BuildBot <[email protected]>
Reviewed-by: Harish Sharma <[email protected]>
Reviewed-by: Stephan Wiesand <[email protected]>
src/afs/UKERNEL/afsincludes.h | 5 +++++
src/auth/ktc.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
--
OpenAFS Master Repository
_______________________________________________
OpenAFS-cvs mailing list
[email protected]
https://lists.openafs.org/mailman/listinfo/openafs-cvs
