diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-08-18 16:17:15 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-08-18 16:17:15 -0400 |
| commit | c24539997a2ed96e089551e046afa0ef55cfacda (patch) | |
| tree | 7142b582c57f5df7efeaa9f2c0492483e719e361 | |
| parent | aafbe55598e51d491cc8760cd992838e6202c473 (diff) | |
| parent | f4d2a81d7fa375af270b95da25acea8b0a0150e5 (diff) | |
Merge commit 'jrollins/master'
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/common | 2 |
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 ] @@ -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 |