diff options
| -rw-r--r-- | qmail-remote.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/qmail-remote.c b/qmail-remote.c index ee1906c..0e2377e 100644 --- a/qmail-remote.c +++ b/qmail-remote.c | |||
| @@ -387,7 +387,7 @@ void tls_quit(const char *s1, const char *s2) | |||
| 387 | } | 387 | } |
| 388 | # define tls_quit_error(s) tls_quit(s, ssl_error()) | 388 | # define tls_quit_error(s) tls_quit(s, ssl_error()) |
| 389 | 389 | ||
| 390 | static int match_partner(const char *s, int len) | 390 | int match_partner(const char *s, int len) |
| 391 | { | 391 | { |
| 392 | if (!case_diffb(partner_fqdn, len, s) && !partner_fqdn[len]) return 1; | 392 | if (!case_diffb(partner_fqdn, len, s) && !partner_fqdn[len]) return 1; |
| 393 | /* we also match if the name is *.domainname */ | 393 | /* we also match if the name is *.domainname */ |
| @@ -398,14 +398,6 @@ static int match_partner(const char *s, int len) | |||
| 398 | return 0; | 398 | return 0; |
| 399 | } | 399 | } |
| 400 | 400 | ||
| 401 | static int match_suffix(const char *s, const char *suffix) | ||
| 402 | { | ||
| 403 | int diff_len = str_len(s) - str_len(suffix); | ||
| 404 | if (diff_len >= 0 && !case_diffb(suffix, str_len(suffix), s + diff_len)) | ||
| 405 | return 1; | ||
| 406 | return 0; | ||
| 407 | } | ||
| 408 | |||
| 409 | /* don't want to fail handshake if certificate can't be verified */ | 401 | /* don't want to fail handshake if certificate can't be verified */ |
| 410 | int verify_cb(int preverify_ok, X509_STORE_CTX *ctx) { return 1; } | 402 | int verify_cb(int preverify_ok, X509_STORE_CTX *ctx) { return 1; } |
| 411 | 403 | ||
| @@ -773,14 +765,6 @@ void smtp() | |||
| 773 | #endif | 765 | #endif |
| 774 | 766 | ||
| 775 | code = smtpcode(); | 767 | code = smtpcode(); |
| 776 | #ifdef TLS | ||
| 777 | if (code == 554 && partner_fqdn != NULL && ( | ||
| 778 | match_suffix(partner_fqdn, "web.de") || | ||
| 779 | match_suffix(partner_fqdn, "gmx.net") || | ||
| 780 | match_suffix(partner_fqdn, "kundenserver.de"))) { | ||
| 781 | code = 454; /* 4xx, does not really matter */ | ||
| 782 | } | ||
| 783 | #endif | ||
| 784 | if (code >= 500 && code < 600) quit("DConnected to "," but greeting failed"); | 768 | if (code >= 500 && code < 600) quit("DConnected to "," but greeting failed"); |
| 785 | if (code >= 400 && code < 500) return; /* try next MX, see RFC-2821 */ | 769 | if (code >= 400 && code < 500) return; /* try next MX, see RFC-2821 */ |
| 786 | if (code != 220) quit("ZConnected to "," but greeting failed"); | 770 | if (code != 220) quit("ZConnected to "," but greeting failed"); |
