From d1eefe3658077a0a40f04de6e4c1b548252bd88c Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 18 Apr 2008 17:38:34 -0400
Subject: [PATCH] --- yaml --- r: 91715 b: refs/heads/master c:
 11670889380b144adfa5a91dc184c8f6300c4b28 h: refs/heads/master i:   91713:
 09e5bea8b079eb95d364d18813fae32e367b8f24   91711:
 e9644d62263341636fc22a886acab8212c755ba8 v: v3

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

diff --git a/[refs] b/[refs]
index 90819c05b8d2..4098f618ddb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d55a345c09ef1708bd341395792931a66306ba6
+refs/heads/master: 11670889380b144adfa5a91dc184c8f6300c4b28
diff --git a/trunk/security/selinux/ss/sidtab.c b/trunk/security/selinux/ss/sidtab.c
index 53a54a77f1f8..4a516ff4bcde 100644
--- a/trunk/security/selinux/ss/sidtab.c
+++ b/trunk/security/selinux/ss/sidtab.c
@@ -156,12 +156,10 @@ void sidtab_map_remove_on_error(struct sidtab *s,
 		while (cur != NULL) {
 			ret = apply(cur->sid, &cur->context, args);
 			if (ret) {
-				if (last) {
+				if (last)
 					last->next = cur->next;
-				} else {
+				else
 					s->htable[i] = cur->next;
-				}
-
 				temp = cur;
 				cur = cur->next;
 				context_destroy(&temp->context);