diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2008-03-07 13:16:58 +0000 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2008-03-07 13:16:58 +0000 |
| commit | 3948bb44ff30ebda9837480c42de7f0d384e4cb9 (patch) | |
| tree | f81308db46bc55ae85e531f285481fd9966a0ea7 /fetchmail.c | |
| parent | ee75486152cf3ded79d3aa5dfe8158f42472eb78 (diff) | |
| download | fetchmail-3948bb44ff30ebda9837480c42de7f0d384e4cb9.tar.gz fetchmail-3948bb44ff30ebda9837480c42de7f0d384e4cb9.tar.bz2 fetchmail-3948bb44ff30ebda9837480c42de7f0d384e4cb9.zip | |
Merge Daniel Richard G.'s --sslcommonname option.
Exception from no-features policy on 6.3.X is made to keep people away from
doing more dangerous things in order to get rid of CommonName mismatch
warnings.
svn path=/branches/BRANCH_6-3/; revision=5165
Diffstat (limited to 'fetchmail.c')
| -rw-r--r-- | fetchmail.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fetchmail.c b/fetchmail.c index ab335380..bf88b4dd 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -966,6 +966,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) FLAG_MERGE(sslproto); FLAG_MERGE(sslcertck); FLAG_MERGE(sslcertpath); + FLAG_MERGE(sslcommonname); FLAG_MERGE(sslfingerprint); #endif FLAG_MERGE(expunge); @@ -1637,6 +1638,8 @@ static void dump_params (struct runctl *runp, if (ctl->sslcertpath != NULL) printf(GT_(" SSL trusted certificate directory: %s\n"), ctl->sslcertpath); } + if (ctl->sslcommonname != NULL) + printf(GT_(" SSL server CommonName: %s\n"), ctl->sslcommonname); if (ctl->sslfingerprint != NULL) printf(GT_(" SSL key fingerprint (checked against the server key): %s\n"), ctl->sslfingerprint); #endif |