From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 12 Jul 2007 19:11:19 +0000 (+0000)
Subject: STABLE14-suser-aix-macro-20070712
X-Git-Tag: openafs-stable-1_4_5-pre1~62
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=daf5c89c153843200c8618fc4278185ef2856530;p=packages%2Fo%2Fopenafs.git

STABLE14-suser-aix-macro-20070712


can't use ifdefs inside the macro...


(cherry picked from commit 7aa5f7ad8b50e74eba1a9f359c1c5ae44b87a016)
---

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 3b9b28f05..3911b8feb 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -498,13 +498,13 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6)
 #endif /* AFS_SGI61_ENV */
 
     AFS_STATCNT(afs_syscall_call);
-    if (!afs_suser(
+    if (
 #ifdef	AFS_SUN5_ENV
-		   CRED()
+	!afs_suser(CRED())
 #else
-		   NULL
+	!afs_suser(NULL)
 #endif
-		   ) && (parm != AFSOP_GETMTU) && (parm != AFSOP_GETMASK)) {
+		    && (parm != AFSOP_GETMTU) && (parm != AFSOP_GETMASK)) {
 	/* only root can run this code */
 #if defined(AFS_OSF_ENV) || defined(AFS_SUN5_ENV) || defined(KERNEL_HAVE_UERROR)
 #if defined(KERNEL_HAVE_UERROR)