From: Jean-Marc Pigeon (Delson) Date: Fri, 11 Apr 2025 14:47:57 +0000 (-0400) Subject: Need to check "unable to get certificat from remote (openssl)" X-Git-Tag: tag-0.7~21 X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=0cdf00726625c0cb4aa1af7f21242a2cd5593080;p=jmp%2Fmailleur Need to check "unable to get certificat from remote (openssl)" --- diff --git a/lib/lvleml.c b/lib/lvleml.c index 659cd8e..7f9d092 100644 --- a/lib/lvleml.c +++ b/lib/lvleml.c @@ -105,6 +105,27 @@ if (contact!=(CONTYP *)0) { */ /********************************************************/ /* */ +/* Procedure to send ready link information */ +/* is a correct one */ +/* */ +/********************************************************/ +static void linkready(CONTYP *contact) + +{ +char *crypted; + +crypted="cleartext"; +if (contact->tlsok==true) + crypted="crypted"; +(void) transmit(contact,"%d-%s, link (%s) ready, your IP/FQDN=[%s/%s]", + CMDOK,contact->locname,crypted, + contact->peerip,contact->peername); +} +/* +^L +*/ +/********************************************************/ +/* */ /* Procedure to check if helo or ehlo paratmeter */ /* is a correct one */ /* */ @@ -122,7 +143,7 @@ done=false; phase=0; proceed=true; while (proceed==true) { - (void) rou_alert(0,"JMPDBG %s phase='%d' parm=<%s>",OPEP,phase,parameter); + //(void) rou_alert(0,"JMPDBG %s phase='%d' parm=<%s>",OPEP,phase,parameter); switch (phase) { case 0 : //checking if we have a parameter if ((parameter==(char *)0)||(strlen(parameter)==0)) @@ -172,9 +193,7 @@ _Bool done; if ((done=isgoodfqdn(contact,parameter))==false) (void) transmit(contact,"%d 5.5.4 %s.",BADPAR,DETAIL); else - (void) transmit(contact,"%d %s ready, your IP/FQDN=[%s/%s]", - CMDOK,contact->locname, - contact->peerip,contact->peername); + (void) linkready(contact); return done; #undef DETAIL #undef OPEP @@ -216,7 +235,7 @@ strstart=0; phase=0; proceed=true; while (proceed==true) { - (void) rou_alert(0,"JMPDBG %s phase='%d'",OPEP,phase); + //(void) rou_alert(0,"JMPDBG %s phase='%d'",OPEP,phase); switch (phase) { case 0 : //Do we have a parameter if ((done=isgoodfqdn(contact,parameter))==false) { @@ -225,12 +244,10 @@ while (proceed==true) { } break; case 1 : //thereis an FQDN - if (contact->tlsok==true) - strstart++; - (void) transmit(contact,"%d-%s ready, your IP/FQDN=[%s/%s]", - CMDOK,contact->locname, - contact->peerip,contact->peername); + (void) linkready(contact); (void) transmit(contact,"%d-SIZE %ld",CMDOK,MXMSIZE); + if (contact->tlsok==true) + strstart++; for (int i=strstart;ehlostr[i]!=(char *)0;i++) { (void) transmit(contact,"%d%s",CMDOK,ehlostr[i]); } diff --git a/lib/unieml.c b/lib/unieml.c index 79f4e1c..e08be93 100644 --- a/lib/unieml.c +++ b/lib/unieml.c @@ -84,11 +84,13 @@ return sesid; PUBLIC CODTYP eml_getcode(char *keyword) { +#define OPEP "unieml.c:eml_getcode" + CODTYP code; VOCTYP *ptr; code=c_unknown; - (void) rou_alert(0,"JMDPBG keywork1=<%s>",keyword); +//(void) rou_alert(0,"%s JMDPBG word=<%s>",OPEP,keyword); for (ptr=vocsmtp;ptr->code!=c_unknown;ptr++) { if (strncasecmp(ptr->key,keyword,strlen(ptr->key))==0) { char *par; @@ -96,7 +98,7 @@ for (ptr=vocsmtp;ptr->code!=c_unknown;ptr++) { code=ptr->code; par=keyword+strlen(ptr->key); (void) strcpy(keyword,par); - (void) rou_alert(0,"JMDPBG keywork2=<%s>",keyword); + //(void) rou_alert(0,"%s JMDPBG word now=<%s>",OPEP,keyword); break; } }