Patch: Elm ME+ 2.5 PLalpha48 -> Elm ME+ 2.5 PLalpha49 [5/9] (5/5)
From
Kari Hurtta@21:1/5 to
All on Thu Jan 3 16:43:16 2019
[continued from previous message]
S_(mailer_info_verify_addr submission_mailer_info_verify_addr)
! static enum mi_vrfyaddr_mailer_status
! submission_mailer_info_verify_addr P_((struct mailer_config *M,
! struct mailer_info *I,
! const char *text,
! struct addr_verify_result
! *result));
! static enum mi_vrfyaddr_mailer_status submission_mailer_info_verify_addr(M,I,text,result)
struct mailer_config *M;
struct mailer_info *I;
const char *text;
struct addr_verify_result *result;
{
if (!submission_verify_address) {
+ enum mi_vrfyaddr_mailer_status ret = mi_vrfyaddr_test_passwd;
DPRINT(Debug,13,(&Debug,
! "submission_mailer_info_verify_addr=%d (Verify disabled)\n",
! ret));
! return ret; /* Cannot VRFY user */
}
return smtp_tail_verify_addr(M,I,text,result);
***************
*** 5057,5075 ****
int ret,r;
int pair[2];
union ss_action_routine_data data;
- I->p.p1 = safe_malloc(sizeof (* (I->p.p1)));
-
- /* bzero is defined on hdrs/defs.h */
- bzero((void *)I->p.p1,sizeof (* (I->p.p1)));
-
- I->p.p1->magic = SMTP_mailer_info_magic;
-
DPRINT(Debug,13,(&Debug,
"sendmailbs_mailer_info_init: mailer info, I=%p\n",I));
! zero_remote_account(& (I->p.p1->RA));
r = socketpair(AF_UNIX,SOCK_STREAM,0, pair);
--- 5535,5551 ----
int ret,r;
int pair[2];
+ int r1;
+
union ss_action_routine_data data;
DPRINT(Debug,13,(&Debug,
"sendmailbs_mailer_info_init: mailer info, I=%p\n",I));
! I->p.smtp = malloc_smtp_info();
!
! I->p.smtp->state = smtp_wait_reply;
! I->p.smtp->SMTP_flags = SMTP_submission;
r = socketpair(AF_UNIX,SOCK_STREAM,0, pair);
***************
*** 5080,5089 ****
"socketpair failed: %s"),
strerror(err));
! I->p.p1->magic = 0; /* Invalidate */
! free(I->p.p1);
! I->p.p1 = NULL;
return 0;
}
--- 5556,5565 ----
"socketpair failed: %s"),
strerror(err));
! I->p.smtp->magic = 0; /* Invalidate */
! free(I->p.smtp);
! I->p.smtp = NULL;
return 0;
}
***************
*** 5093,5109 ****
/* Connect standard imput and output to other end of socket ... */
! ret = start_run( & (I->p.p1->RS),options,argv,pair[1],pair[1]);
/