diff options
| author | Werner Koch <wk@gnupg.org> | 2007-06-06 20:12:30 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-06-06 20:12:30 +0200 |
| commit | 2c9791db555cc571eaedfa71444da05454bd052a (patch) | |
| tree | 9566d22f85e562e0c7b35dacc1697c9a58fcff1a /keyserver | |
| parent | Print passphrase encoding info only in PEM mode. (diff) | |
| download | gnupg2-2c9791db555cc571eaedfa71444da05454bd052a.tar.xz gnupg2-2c9791db555cc571eaedfa71444da05454bd052a.zip | |
First steps towards supporting W32.
This is mainly source code reorganization.
Update gnulib.
g10/ does currently not build.
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 6 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 26 |
2 files changed, 19 insertions, 13 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 65e8f6213..c738b82d5 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,9 @@ +2007-06-06 Werner Koch <wk@g10code.com> + + * gpgkeys_ldap.c (send_key, send_key_keyserver): Rename eof to + r_eof as some Windows file has such a symbol. + (main): Likewise. + 2007-05-07 Werner Koch <wk@g10code.com> * Makefile.am (gpg2keys_ldap_LDADD): Add GPG_ERROR_LIBS. diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index c409c3435..93b24844a 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -575,7 +575,7 @@ free_mod_values(LDAPMod *mod) } static int -send_key(int *eof) +send_key(int *r_eof) { int err,begin=0,end=0,keysize=1,ret=KEYSERVER_INTERNAL_ERROR; char *dn=NULL,line[MAX_LINE],*key=NULL; @@ -631,14 +631,14 @@ send_key(int *eof) { /* i.e. eof before the INFO BEGIN was found. This isn't an error. */ - *eof=1; + *r_eof=1; ret=KEYSERVER_OK; goto fail; } if(strlen(keyid)!=16) { - *eof=1; + *r_eof=1; ret=KEYSERVER_KEY_INCOMPLETE; goto fail; } @@ -678,7 +678,7 @@ send_key(int *eof) if(!end) { fprintf(console,"gpgkeys: no INFO %s END found\n",keyid); - *eof=1; + *r_eof=1; ret=KEYSERVER_KEY_INCOMPLETE; goto fail; } @@ -699,7 +699,7 @@ send_key(int *eof) { /* i.e. eof before the KEY BEGIN was found. This isn't an error. */ - *eof=1; + *r_eof=1; ret=KEYSERVER_OK; goto fail; } @@ -733,7 +733,7 @@ send_key(int *eof) if(!end) { fprintf(console,"gpgkeys: no KEY %s END found\n",keyid); - *eof=1; + *r_eof=1; ret=KEYSERVER_KEY_INCOMPLETE; goto fail; } @@ -791,7 +791,7 @@ send_key(int *eof) } static int -send_key_keyserver(int *eof) +send_key_keyserver(int *r_eof) { int err,begin=0,end=0,keysize=1,ret=KEYSERVER_INTERNAL_ERROR; char *dn=NULL,line[MAX_LINE],*key[2]={NULL,NULL}; @@ -840,7 +840,7 @@ send_key_keyserver(int *eof) { /* i.e. eof before the KEY BEGIN was found. This isn't an error. */ - *eof=1; + *r_eof=1; ret=KEYSERVER_OK; goto fail; } @@ -871,7 +871,7 @@ send_key_keyserver(int *eof) if(!end) { fprintf(console,"gpgkeys: no KEY %s END found\n",keyid); - *eof=1; + *r_eof=1; ret=KEYSERVER_KEY_INCOMPLETE; goto fail; } @@ -2272,7 +2272,7 @@ main(int argc,char *argv[]) } else if(opt->action==KS_SEND) { - int eof=0; + int eof_seen = 0; do { @@ -2280,16 +2280,16 @@ main(int argc,char *argv[]) if(real_ldap) { - if(send_key(&eof)!=KEYSERVER_OK) + if (send_key(&eof_seen) != KEYSERVER_OK) failed++; } else { - if(send_key_keyserver(&eof)!=KEYSERVER_OK) + if (send_key_keyserver(&eof_seen) != KEYSERVER_OK) failed++; } } - while(!eof); + while (!eof_seen); } else if(opt->action==KS_SEARCH) { |