Linux: only include cred.h if it exists

Commit c89fd17df1032ec2eacc0d0c9b73e19c5e8db7d2 introduced an explicit
include of linux/cred.h since the latest kernel no longer includes it
implicitly in sched.h. Alas, older kernels (like 2.6.18) don't have this
file. Add a configure test for the existence of cred.h and only include
it if actually present.

Reviewed-on: https://gerrit.openafs.org/12593
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 6b7b4239ab22fbb301e3b50e2ca4072445ba4e9e)

Change-Id: I64970ba471180d32fa5af5445e7604bbe8511b32
Reviewed-on: https://gerrit.openafs.org/12598
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/acinclude.m4 b/acinclude.m4
index 937fb5661bbb1ae1a741c21a1277a017d4c66609..464f356cb71bcbf9525ee3006eae4c83e51a4193 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -868,6 +868,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                                unsigned int flags])
 
                 dnl Check for header files
+                AC_CHECK_LINUX_HEADER([cred.h])
                 AC_CHECK_LINUX_HEADER([config.h])
                 AC_CHECK_LINUX_HEADER([completion.h])
                 AC_CHECK_LINUX_HEADER([exportfs.h])

diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index 9d3faa90355658e82f0a569c2698de4240466e98..9008f7732e1219439278138b28aa84256c689782 100644 (file)
--- a/src/afs/LINUX/osi_machdep.h
+++ b/src/afs/LINUX/osi_machdep.h
@@ -71,8 +71,10 @@
 
 #define afs_hz HZ
 #include "h/sched.h"
-/* in case cred.h is not included in sched.h */
+/* in case cred.h is present but not included in sched.h */
+#if defined(HAVE_LINUX_CRED_H)
 #include "h/cred.h"
+#endif
 #if defined(HAVE_LINUX_CURRENT_KERNEL_TIME)
 static inline time_t osi_Time(void) {
     struct timespec xtime;