Index: contrib/mod_tls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
retrieving revision 1.268
diff -u -r1.268 mod_tls.c
--- contrib/mod_tls.c 23 Jan 2012 01:53:28 -0000 1.268
+++ contrib/mod_tls.c 10 Feb 2012 02:12:23 -0000
@@ -4415,6 +4415,7 @@
case X509_V_ERR_CERT_HAS_EXPIRED:
case X509_V_ERR_CERT_REVOKED:
case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+ case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
case X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
case X509_V_ERR_APPLICATION_VERIFICATION:
@@ -4439,17 +4440,6 @@
break;
}
- case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
- /* XXX this is strange. we get this error for certain clients
- * (i.e. Jeff Altman's kftp) when all is ok. I think it's because the
- * client is actually sending the whole CA cert. This must be figured
- * out, but we let it pass for now. If the CA cert isn't available
- * locally, we will fail anyway.
- */
- tls_log("%s", X509_verify_cert_error_string(ctx->error));
- ok = 1;
- break;
-
default:
tls_log("error verifying client certificate: [%d] %s",
ctx->error, X509_verify_cert_error_string(ctx->error));