diff options
| author | Werner Koch <[email protected]> | 2006-04-19 13:24:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-04-19 13:24:36 +0000 |
| commit | d0907e64f473b743ec7a6888583e19502b804ca2 (patch) | |
| tree | 455edb5bd2b75ce96b967fc398160f3adb989a66 /g10/keyserver.c | |
| parent | Merged with gpg 1.4.3 code. (diff) | |
| download | gnupg-d0907e64f473b743ec7a6888583e19502b804ca2.tar.gz gnupg-d0907e64f473b743ec7a6888583e19502b804ca2.zip | |
Continued with merging.
Still does not build.
Diffstat (limited to 'g10/keyserver.c')
| -rw-r--r-- | g10/keyserver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index af1e5f773..4fd90d08b 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -478,7 +478,7 @@ print_keyrec(int number,struct keyrec *keyrec) if(keyrec->type) { - const char *str=pubkey_algo_to_string(keyrec->type); + const char *str = gcry_pk_algo_name (keyrec->type); if(str) printf("%s ",str); @@ -1402,7 +1402,7 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc, maxlen=1024; if(iobuf_read_line(spawn->fromchild,&line,&buflen,&maxlen)==0) { - ret=G10ERR_READ_FILE; + ret = gpg_error_from_errno (errno); goto fail; /* i.e. EOF */ } |