stupid big jimmy. fix bug in previous bug fix.

diff --git a/debian/changelog b/debian/changelog
index 9d2a13dc4861de3c0048a161149dbe7fdc2ceef1..7e1af90553bc492efda9119bb9dc1f9e871b5882 100644 (file)
--- 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 54ea9cb98c51a84200c3858f1e6666daef2ad7a4..9d7deb7c6251c7ab989f53b49e29fc6e69b6971d 100644 (file)
--- 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