security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

First steps towards supporting W32.

Browse source 
This is mainly source code reorganization.
Update gnulib.
g10/ does currently not build.
This commit is contained in:
Werner Koch 2007-06-06 18:12:30 +00:00
parent c2b08ff908
commit 2c9791db55
116 changed files with 2722 additions and 5565 deletions
Download patch file Download diff file Expand all files Collapse all files

6
keyserver/ChangeLog
View file

@ -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.

26
keyserver/gpgkeys_ldap.c
View file

@ -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)
{