From f4d2a81d7fa375af270b95da25acea8b0a0150e5 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Mon, 18 Aug 2008 13:16:21 -0700
Subject: [PATCH] stupid big jimmy.  fix bug in previous bug fix.

---
 debian/changelog | 6 ++++++
 src/common       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9d2a13d..7e1af90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monkeysphere (0.10-1) experimental; urgency=low
+
+  * Fix bug in previous uid processing bug fix (stupid stupid).
+
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Mon, 18 Aug 2008 13:16:15 -0700
+
 monkeysphere (0.9-1) experimental; urgency=low
 
   [ Daniel Kahn Gillmor ]
diff --git a/src/common b/src/common
index 54ea9cb..9d7deb7 100644
--- a/src/common
+++ b/src/common
@@ -425,7 +425,7 @@ process_user_id() {
 		# if the user ID does matches...
 		if [ "$(echo "$uidfpr" | gpg_unescape)" = "$userID" ] ; then
 		    # and the user ID validity is ok
-		    if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
+		    if [ "$validity" = 'u' -o "$validity" = 'f' ] ; then
 			# mark user ID acceptable
 			uidOK=true
 		    fi
-- 
2.25.1