From 89505fe94852b6f1ae52829476c37b8617d11e5c Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Tue, 3 Aug 2010 15:26:05 -0400
Subject: [PATCH] --- yaml --- r: 211663 b: refs/heads/master c:
 daa6d83a2863c28197b0c7dabfdf1e0606760b78 h: refs/heads/master i:   211661:
 54573bfa5ce23bf258ead748192c77cac6e6de8a   211659:
 edfe3218e63650f7f28065b2788ecdaee3fb7b4a   211655:
 4d8c139e4f4ffe7c3f658ec0b73a3ef239bbb16e   211647:
 48b54529a0c99dfdaf390682b35c19938908212a v: v3

---
 [refs]                               | 2 +-
 trunk/security/selinux/ss/policydb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ca06b971490f..2f02d1df4ed6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68eda8f59081c74a51d037cc29893bd7c9b3c2d8
+refs/heads/master: daa6d83a2863c28197b0c7dabfdf1e0606760b78
diff --git a/trunk/security/selinux/ss/policydb.c b/trunk/security/selinux/ss/policydb.c
index 3a29704be8ce..aa5a2fd1cc09 100644
--- a/trunk/security/selinux/ss/policydb.c
+++ b/trunk/security/selinux/ss/policydb.c
@@ -1624,11 +1624,11 @@ static int role_bounds_sanity_check(void *key, void *datum, void *datap)
 
 static int type_bounds_sanity_check(void *key, void *datum, void *datap)
 {
-	struct type_datum *upper, *type;
+	struct type_datum *upper;
 	struct policydb *p = datap;
 	int depth = 0;
 
-	upper = type = datum;
+	upper = datum;
 	while (upper->bounds) {
 		if (++depth == POLICYDB_BOUNDS_MAXDEPTH) {
 			printk(KERN_ERR "SELinux: type %s: "