summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-18 13:16:21 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-18 13:16:21 -0700
commitf4d2a81d7fa375af270b95da25acea8b0a0150e5 (patch)
tree698f281267eec0a9cc4bceb60c28f2c5fbd70c1a
parentc5998e1bd287c1a57e9962f8d17a7431544a9ee2 (diff)
stupid big jimmy. fix bug in previous bug fix.
-rw-r--r--debian/changelog6
-rw-r--r--src/common2
2 files changed, 7 insertions, 1 deletions
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