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

Prepared for last 1.4 release candidate

Browse source
This commit is contained in:
Werner Koch 2004-12-14 07:49:27 +00:00
parent 1037420b76
commit d0b9eff4b6
43 changed files with 12337 additions and 14242 deletions
Download patch file Download diff file Expand all files Collapse all files

15
g10/keyserver.c
View file

@ -789,10 +789,15 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
#endif
/* Build the filename for the helper to execute */
/* Note that we don't use a symlink for "ldaps" anymore because this
won't work under MS Windows. */
command=m_alloc(strlen("gpgkeys_")+strlen(keyserver->scheme)+1);
strcpy(command,"gpgkeys_");
strcat(command,keyserver->scheme);
strcpy(command,"gpgkeys_");
if (!strcmp (keyserver->scheme, "ldaps"))
strcat(command, "ldap");
else
strcat(command,keyserver->scheme);
if(opt.keyserver_options.options&KEYSERVER_USE_TEMP_FILES)
{
if(opt.keyserver_options.options&KEYSERVER_KEEP_TEMP_FILES)
@ -1247,7 +1252,9 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
case KEYSERVER_VERSION_ERROR:
log_error(_("gpgkeys_%s does not support handler version %d\n"),
keyserver->scheme,KEYSERVER_PROTO_VERSION);
!strcmp (keyserver->scheme,"ldaps")?
"ldap": keyserver->scheme,
KEYSERVER_PROTO_VERSION);
break;
case KEYSERVER_TIMEOUT: