diff options
| author | Werner Koch <[email protected]> | 2004-12-14 07:49:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-12-14 07:49:27 +0000 |
| commit | d0b9eff4b6945635227e9e1dd922552a038846b0 (patch) | |
| tree | ef4d2ebf6808dba98a69761f9227403b38dffdee /g10/keyserver.c | |
| parent | (read_passphrase_from_fd): Fixed memory leak. (diff) | |
| download | gnupg-d0b9eff4b6945635227e9e1dd922552a038846b0.tar.gz gnupg-d0b9eff4b6945635227e9e1dd922552a038846b0.zip | |
Prepared for last 1.4 release candidate
Diffstat (limited to 'g10/keyserver.c')
| -rw-r--r-- | g10/keyserver.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 744ce2cad..5084a7c15 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -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: |