0014-S2S-TLS-GnuTLS-Streamline-logging.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. From e092877d9ad69f0cb4dea10bf546e561dd6a1abd Mon Sep 17 00:00:00 2001
  2. From: Alexander Barton <alex@barton.de>
  3. Date: Fri, 5 Jan 2024 22:31:32 +0100
  4. Subject: [PATCH 14/20] S2S-TLS/GnuTLS: Streamline logging
  5. (cherry picked from commit 663972c88d3ae3e3226fe6f95ca1113694ce0618)
  6. ---
  7. src/ngircd/conn-ssl.c | 12 +++++++-----
  8. 1 file changed, 7 insertions(+), 5 deletions(-)
  9. --- a/src/ngircd/conn-ssl.c
  10. +++ b/src/ngircd/conn-ssl.c
  11. @@ -869,8 +869,10 @@
  12. default:
  13. assert(code < 0);
  14. if (gnutls_error_is_fatal(code)) {
  15. - Log(LOG_ERR, "SSL error: %s [%s].",
  16. - gnutls_strerror(code), fname);
  17. + /* We don't need to log this here, the generic
  18. + * connection layer will take care of it. */
  19. + LogDebug("SSL error: %s [%s].",
  20. + gnutls_strerror(code), fname);
  21. ConnSSL_Free(c);
  22. return -1;
  23. }
  24. @@ -914,12 +916,12 @@
  25. assert(size);
  26. issuer_dn = LogMalloc(size);
  27. if (!issuer_dn) {
  28. - Log(level, "%s: Distinguished Name: %s", msg, dn);
  29. + Log(level, "%s: Distinguished Name \"%s\".", msg, dn);
  30. free(dn);
  31. return;
  32. }
  33. gnutls_x509_crt_get_issuer_dn(cert, issuer_dn, &size);
  34. - Log(level, "%s: Distinguished Name: \"%s\", Issuer \"%s\"", msg, dn,
  35. + Log(level, "%s: Distinguished Name \"%s\", Issuer \"%s\".", msg, dn,
  36. issuer_dn);
  37. free(dn);
  38. free(issuer_dn);
  39. @@ -979,7 +981,7 @@
  40. * hand we want client certificates, for example for
  41. * "CertFP" authentication with services ... */
  42. LogOpenSSL_CertInfo(LOG_INFO, peer_cert,
  43. - "Got unchecked client certificate");
  44. + "Got unchecked peer certificate");
  45. }
  46. X509_free(peer_cert);