From: Stephan Wiesand <stephan.wiesand@desy.de>
Date: Tue, 11 Apr 2017 09:58:55 +0000 (+0200)
Subject: Linux: only include cred.h if it exists
X-Git-Tag: upstream/1.8.0_pre2^3~45
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6b7b4239ab22fbb301e3b50e2ca4072445ba4e9e;p=packages%2Fo%2Fopenafs.git

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.

Change-Id: Ia7e38160492b1e03cdb257e4b2bef4d18c4a28fb
Reviewed-on: https://gerrit.openafs.org/12593
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 26bae1efa..99a5691ec 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -931,6 +931,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([exportfs.h])
 		 AC_CHECK_LINUX_HEADER([freezer.h])
diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index 9d3faa903..9008f7732 100644
--- 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;