[continued from previous message]

succeed = 1; /* unexpect OK response */
}
***************
*** 4024,4065 ****
0 == memcmp(response_code,"550",3) /* mailbox unavailable */
) {
DPRINT(Debug,4,(&Debug,
! " verify response %.3s -- cannot verify user -- smtp_common_mailer_info_set_ef failed\n",
response_code));
goto failed;
} else if ('4' == response_code[0])
DPRINT(Debug,4,(&Debug,
! " verify response %.3s -- cannot verify user -- smtp_common_mailer_info_set_ef assuming ok \n",
response_code));
else {
! DPRINT(Debug,13,(&Debug, "-- Disabling verify...\n"));
! I->p.p1->SMTP_flags |= SMTP_noverify;
DPRINT(Debug,4,(&Debug,
! " verify response %.3s -- cannot verify user -- smtp_common_mailer_info_set_ef assuming ok \n",
response_code));
}
succeed = 1;
}
!
! if (succeed) {
succeed:
! X->mail_from = strmcpy(X->mail_from,value);
} else {
failed:
! lib_error(CATGETS(elm_msg_cat, SmtpSet,
! SmtpEnvSenderFailed,
! "Changing of envelope sender failed: %s"),
! value);
}
! smtp_command_reset(I->p.p1);
} else {
DPRINT(Debug,4,(&Debug,
! "smtp_common_mailer_info_set_ef failed to run verify command\n"));
lib_error(CATGETS(elm_msg_cat, SmtpSet,
SmtpEnvSenderFailed,
"Changing of envelope sender failed: %s"),
value);
}
}


--- 4402,4513 ----
0 == memcmp(response_code,"550",3) /* mailbox unavailable */
) {
DPRINT(Debug,4,(&Debug,
! "smtp_set_mail_from: verify response %.3s -- cannot verify user -- failed\n",
response_code));
goto failed;
} else if ('4' == response_code[0])
DPRINT(Debug,4,(&Debug,
! "smtp_set_mail_from: verify response %.3s -- cannot verify user -- assuming ok \n",
response_code));
else {
! DPRINT(Debug,13,(&Debug, "smtp_set_mail_from: Disabling verify...\n"));
! I->p.smtp->SMTP_flags |= SMTP_noverify;
DPRINT(Debug,4,(&Debug,
! "smtp_set_mail_from: verify response %.3s -- cannot verify user -- assuming ok \n",
response_code));
}
succeed = 1;
}
!
! if (!succeed && 0 == (X->flags & MAILER_ef_verified)) {
! DPRINT(Debug,4,(&Debug,
! "smtp_set_mail_from: previous envelope sender %s was not verified either ... ignoring VRFY error\n",
! X->mail_from ? X->mail_from : "(none)"));
!
!