aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-03-19 14:24:36 +0000
committerDavid Shaw <[email protected]>2005-03-19 14:24:36 +0000
commit8885f0b0cc855ab153cd2d8ad58ffedf4f48fc86 (patch)
tree3f7c255f0bcf20d21104e04f84ce282b098f927c
parent* keyedit.c (command_generator, keyedit_completion) [HAVE_LIBREADLINE]: (diff)
downloadgnupg-8885f0b0cc855ab153cd2d8ad58ffedf4f48fc86.tar.gz
gnupg-8885f0b0cc855ab153cd2d8ad58ffedf4f48fc86.zip
* gpgkeys_ldap.c (main): Fix three wrong calls to fail_all(). Noted
by Stefan Bellon.
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/gpgkeys_ldap.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index e27e9e8ca..a85b6181a 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-19 David Shaw <[email protected]>
+
+ * gpgkeys_ldap.c (main): Fix three wrong calls to fail_all().
+ Noted by Stefan Bellon.
+
2005-03-17 David Shaw <[email protected]>
* ksutil.c (parse_ks_options): Handle verbose=nnn.
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index df144967a..f96555edd 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -1855,7 +1855,7 @@ main(int argc,char *argv[])
#else
fprintf(console,"gpgkeys: unable to make SSL connection: %s\n",
"not built with LDAPS support");
- fail_all(keylist,action,KEYSERVER_INTERNAL_ERROR);
+ fail_all(keylist,KEYSERVER_INTERNAL_ERROR);
goto fail;
#endif
}
@@ -1922,7 +1922,7 @@ main(int argc,char *argv[])
"not built with TLS support");
if(use_tls==3)
{
- fail_all(keylist,action,KEYSERVER_INTERNAL_ERROR);
+ fail_all(keylist,KEYSERVER_INTERNAL_ERROR);
goto fail;
}
#endif
@@ -1941,7 +1941,7 @@ main(int argc,char *argv[])
{
fprintf(console,"gpgkeys: internal LDAP bind error: %s\n",
ldap_err2string(err));
- fail_all(keylist,action,ldap_err_to_gpg_err(err));
+ fail_all(keylist,ldap_err_to_gpg_err(err));
goto fail;
}
else