s/ehlo/helo/, to be able to talk also to SMTP (!ESMTP) servers (like

mail01.stiftung-warentest.de, mx of test.de, software: CheckPoint FireWall-1 secure SMTP server)
This commit is contained in:
whottgen 2004-12-03 10:48:22 +00:00
parent b75f59fdd8
commit 928e2ca7bc

View File

@ -64,7 +64,7 @@ struct verify_container_handle_s {
pthread_mutex_t *cache_mutex;
char *cache_file;
char *sender_address;
char *ehlo_arg;
char *helo_arg;
int smtp_port;
int max_checker_threads;
};
@ -167,7 +167,7 @@ int verify_init(cfgl_t *cfg, void **handle) {
vch->timeout_result = atoi(findcfglx(vch->cfg, "timeout_result", "5"));
vch->timeout_dialog = atoi(findcfglx(vch->cfg, "timeout_dialog", "20"));
vch->sender_address = findcfglx(vch->cfg, "sender_address", "<>");
vch->ehlo_arg = findcfglx(vch->cfg, "ehlo_arg", "local");
vch->helo_arg = findcfglx(vch->cfg, "helo_arg", "local");
vch->smtp_port = atoi(findcfglx(vch->cfg, "smtp_port", "25"));
vch->max_checker_threads = atoi(findcfglx(vch->cfg, "max_checker_threads", "25"));
vch->cache_enabled = atoi(findcfglx(vch->cfg, "cache_enabled", "1"));
@ -521,7 +521,7 @@ static void *checker_thread(void *arg) {
int timeout = ct->vwh->vch->timeout_dialog;
char *sender_address = ct->vwh->vch->sender_address;
char *ehlo_arg = ct->vwh->vch->ehlo_arg;
char *helo_arg = ct->vwh->vch->helo_arg;
int port = ct->vwh->vch->smtp_port;
smtp_t *smtp;
@ -559,7 +559,7 @@ static void *checker_thread(void *arg) {
err = smtp_connect(smtp);
break;
case EHLO:
err = smtp_ehlo(smtp, ehlo_arg);
err = smtp_helo(smtp, helo_arg);
break;
case MAILFROM:
err = smtp_mailfrom(smtp, sender_address);