From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Thu, 21 Jan 2010 22:53:42 +0000 (-0500)
Subject: afs_vnop_attrs: syntax error in conditional expression
X-Git-Tag: openafs-devel-1_5_70~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ddc64898e7b3a26e6514be63ef01672fe67cb851;p=packages%2Fo%2Fopenafs.git

afs_vnop_attrs: syntax error in conditional expression

Add a missing && in a 2-line condition.
Not sure how this could have compiled successfully on the affected
platforms.

Change-Id: I2e8b791c6d8cd09795be1ef52c078ebfa5a3e53b
Reviewed-on: http://gerrit.openafs.org/1140
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c
index 330d84dbc..1c80de465 100644
--- a/src/afs/VNOPS/afs_vnop_attrs.c
+++ b/src/afs/VNOPS/afs_vnop_attrs.c
@@ -221,7 +221,7 @@ afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, afs_ucred_t *acred)
 #endif
     {
 	if (!(code = afs_InitReq(&treq, acred))) {
-	    if (vType(avc) != VDIR && vType(avc) != VLNK
+	    if (vType(avc) != VDIR && vType(avc) != VLNK &&
 	        !afs_AccessOK(avc, PRSFS_READ, &treq, DONT_CHECK_MODE_BITS)) {
 
 		code = EACCES;