From: Marc Dionne <dionne@cs.wisc.edu>
Date: Fri, 9 Feb 2007 00:27:00 +0000 (+0000)
Subject: DEVEL15-keyring-pag-avoid-shadowing-20070208
X-Git-Tag: openafs-devel-1_5_15~29
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=77a5232a7601a38a27b21381f17a655dc1a15f7d

DEVEL15-keyring-pag-avoid-shadowing-20070208

FIXES 38959

avoid shadowing the pag variable


(cherry picked from commit 0dfd1d0ed81547791d8b90f9be2d04b362401422)
---

diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
index 801c741..9ebbdd1 100644
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -601,15 +601,16 @@ out:
 #if defined(AFS_LINUX26_ENV) && defined(LINUX_KEYRING_SUPPORT)
     if (pag == NOPAG) {
 	struct key *key;
-	afs_uint32 pag, newpag;
+	afs_uint32 upag, newpag;
 
 	key = request_key(&key_type_afs_pag, "_pag", NULL);
 	if (!IS_ERR(key)) {
 	    if (key_validate(key) == 0 && key->uid == 0) {	/* also verify in the session keyring? */
-
-		pag = (afs_uint32) key->payload.value;
-		if (((pag >> 24) & 0xff) == 'A')
-		    __setpag(&cred, pag, &newpag, 0);
+		upag = (afs_uint32) key->payload.value;
+		if (((upag >> 24) & 0xff) == 'A') {
+		    __setpag(&cred, upag, &newpag, 0);
+		    pag = (afs_int32) upag;
+		}
 	    }
 	    key_put(key);
 	}