From c835c72ffee2613bcbbc11fd31c69ff9fb5ee26d Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Thu, 28 Apr 2011 15:11:20 -0400
Subject: [PATCH] --- yaml --- r: 250797 b: refs/heads/master c:
 2667991f60e67d28c495b8967aaabf84b4ccd560 h: refs/heads/master i:   250795:
 2f75915733d00f9ec9c0c2b7cdea4ab483360281 v: v3

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

diff --git a/[refs] b/[refs]
index 362010170f8a..ba3768cd0827 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4742600cf536c0c115b6f769eda82ee377d199c9
+refs/heads/master: 2667991f60e67d28c495b8967aaabf84b4ccd560
diff --git a/trunk/security/selinux/ss/services.c b/trunk/security/selinux/ss/services.c
index 3e1ae85c0130..78bb8100b02e 100644
--- a/trunk/security/selinux/ss/services.c
+++ b/trunk/security/selinux/ss/services.c
@@ -1359,13 +1359,13 @@ static int compute_sid_handle_invalid_context(
 }
 
 static void filename_compute_type(struct policydb *p, struct context *newcontext,
-				  u32 scon, u32 tcon, u16 tclass,
+				  u32 stype, u32 ttype, u16 tclass,
 				  const char *objname)
 {
 	struct filename_trans *ft;
 	for (ft = p->filename_trans; ft; ft = ft->next) {
-		if (ft->stype == scon &&
-		    ft->ttype == tcon &&
+		if (ft->stype == stype &&
+		    ft->ttype == ttype &&
 		    ft->tclass == tclass &&
 		    !strcmp(ft->name, objname)) {
 			newcontext->type = ft->otype;