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 3b9b28f05a34a0b244bada5717215d4492036dec..3911b8febfff0e97061165c63e49d8794a9110d4 100644 (file)
--- 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)