diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/common | 25 |
2 files changed, 17 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index ecb2f16..828973f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +monkeysphere (0.9-1) experimental; urgency=low + + * fixed bug in user id processing that prevented bad primary keys from + being properly removed. + + -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Mon, 18 Aug 2008 10:13:36 -0700 + monkeysphere (0.8-1) experimental; urgency=low [ Daniel Kahn Gillmor ] @@ -393,29 +393,24 @@ process_user_id() { ;; 'uid') # user ids if [ "$lastKey" != pub ] ; then - log " - got a user ID after a sub key! user IDs should only follow primary keys!" - continue - fi - # don't bother with a uid if there is no valid or reasonable primary key. - if [ "$keyOK" != true ] ; then + log " - got a user ID after a sub key?! user IDs should only follow primary keys!" continue fi # if an acceptable user ID was already found, skip - if [ "$uidOK" ] ; then - continue - fi - # if the user ID does not match, skip - if [ "$(echo "$uidfpr" | gpg_unescape)" != "$userID" ] ; then + if [ "$uidOK" = 'true' ] ; then continue fi - # if the user ID validity is not ok, skip - if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then + # 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 + # mark user ID acceptable + uidOK=true + fi + else continue fi - # mark user ID acceptable - uidOK=true - # output a line for the primary key # 0 = ok, 1 = bad if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then |