← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gnupg2/intrepid

« back to all changes in this revision

Viewing changes to g10/keyserver.c

  • Committer: Bazaar Package Importer
  • Author(s): Eric Dorland
  • Date: 2008-04-28 03:22:20 UTC
  • mfrom: (1.1.10 upstream)
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20080428032220-a8rl6klzavd4nvr4
Tags: 2.0.9-2
http://bugs.debian.org/459462
http://bugs.debian.org/477691
http://bugs.debian.org/462951
http://bugs.debian.org/476999
* The "I've neglected you too long" release.

* debian/control: 
  - Add recommends on gnupg-agent for gpgsm and gnupg2, since they need 
    it under most circumstances. (Closes: #459462, #477691)
  - Depend on pinentry instead of recommend, and move pinentry-gtk2 to the 
    front of the alternatives list. (Closes: #462951)
* keyserver/gpgkeys_curl.c, keyserver/gpgkeys_hkp.c: Fix FTBFS with gcc
  4.3 strictness on bitfields combined with curl. (Closes: #476999)

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/keyserver.c
683
683
      while(*tok)
684
684
        if(tok[0]=='%' && tok[1] && tok[2])
685
685
          {
686
 
            if((userid[i]=hextobyte(&tok[1]))==-1)
687
 
              userid[i]='?';
 
686
            int c;
688
687
 
 
688
            userid[i] = (c=hextobyte(&tok[1])) == -1 ? '?' : c;
689
689
            i++;
690
690
            tok+=3;
691
691
          }