From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 21 Feb 2016 10:58:39 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.6~59
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=642445e95fea1c548c79f80ad3b5d6f30ba572f3;hp=acb1a26a30ccfdd125d7eaa3fe0360df85bbe24a;p=paraslash.git

Merge branch 'maint'

A single fix that avoids to shift 32 bit integers for attribute
bitmasks where 64 bit quantities are necessary.
---

diff --git a/aft.c b/aft.c
index f5830dac..261054df 100644
--- a/aft.c
+++ b/aft.c
@@ -2401,6 +2401,7 @@ static int com_setatt_callback(struct afs_callback_arg *aca)
 	) {
 		char c;
 		unsigned char bitnum;
+		uint64_t one = 1;
 
 		len = strlen(p);
 		ret = -E_ATTR_SYNTAX;
@@ -2416,9 +2417,9 @@ static int com_setatt_callback(struct afs_callback_arg *aca)
 			goto out;
 		}
 		if (c == '+')
-			cad.add_mask |= (1UL << bitnum);
+			cad.add_mask |= (one << bitnum);
 		else
-			cad.del_mask |= (1UL << bitnum);
+			cad.del_mask |= (one << bitnum);
 	}
 	ret = -E_ATTR_SYNTAX;
 	if (!cad.add_mask && !cad.del_mask)