aboutsummaryrefslogtreecommitdiffstats
path: root/socket.c
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2006-01-04 16:03:20 +0000
committerMatthias Andree <matthias.andree@gmx.de>2006-01-04 16:03:20 +0000
commita2eea3bf22d24fec7406e7a09d47d9f1f3441c05 (patch)
treea5d0167523b586a35d33790c8326d11ad979fb5d /socket.c
parentb4f2a65d7e700082cf369653fec64e46134f68b1 (diff)
downloadfetchmail-a2eea3bf22d24fec7406e7a09d47d9f1f3441c05.tar.gz
fetchmail-a2eea3bf22d24fec7406e7a09d47d9f1f3441c05.tar.bz2
fetchmail-a2eea3bf22d24fec7406e7a09d47d9f1f3441c05.zip
Some verbose output disappeared in debug mode. Adding further -v options
would alternate between verbose and debug mode. debug mode now comprises all verbose output, and adding more -v options does not switch back from debug to verbose mode. svn path=/branches/BRANCH_6-3/; revision=4597
Diffstat (limited to 'socket.c')
-rw-r--r--socket.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/socket.c b/socket.c
index 66783516..4c3c17d3 100644
--- a/socket.c
+++ b/socket.c
@@ -621,7 +621,7 @@ static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
if (depth == 0 && !_depth0ck) {
_depth0ck = 1;
- if (outlevel == O_VERBOSE) {
+ if (outlevel >= O_VERBOSE) {
if ((i = X509_NAME_get_text_by_NID(issuer, NID_organizationName, buf, sizeof(buf))) != -1) {
report(stdout, GT_("Issuer Organization: %s\n"), buf);
if (i >= sizeof(buf) - 1)
@@ -636,7 +636,7 @@ static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
report(stdout, GT_("Unknown Issuer CommonName\n"));
}
if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) {
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_VERBOSE)
report(stdout, GT_("Server CommonName: %s\n"), buf);
if (i >= sizeof(buf) - 1) {
/* Possible truncation. In this case, this is a DNS name, so this
@@ -661,7 +661,7 @@ static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
if (gn->type == GEN_DNS) {
char *p1 = gn->d.ia5->data;
char *p2 = _ssl_server_cname;
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_VERBOSE)
report(stderr, "Subject Alternative Name: %s\n", p1);
if (*p1 == '*') {
++p1;
@@ -697,7 +697,7 @@ static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
if (strict) return (0);
}
} else {
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_VERBOSE)
report(stdout, GT_("Unknown Server CommonName\n"));
if (ok_return && strict) {
report(stderr, GT_("Server name not specified in certificate!\n"));