From: Jean-Marc Pigeon (Delson) <jmp@safe.ca>
Date: Thu, 17 Jul 2025 13:30:43 +0000 (-0400)
Subject: Small adjustment about messaging
X-Git-Tag: tag-0.14~76
X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=50f34fc2e3c1caaeefa961963cad249b67650b8f;p=jmp%2Fmailleur

Small adjustment about messaging
---

diff --git a/Makefile b/Makefile
index ec8bfca..0cd3147 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ FEEDPAR	=						\
 
 #to test with an external server
 extfeed	:	debug
-		@ bin/feeder				\
+		@ bin-utils/feeder			\
 			-f				\
 			-d3				\
 	   		-c ./conf/feeder.conf.dvl	\
@@ -54,7 +54,7 @@ extfeed	:	debug
 
 #direct test
 tstfeed	:  debug
-	   @ bin/feeder					\
+	   @ bin-utils/feeder				\
 			  -c ./conf/$(APPNAME).conf.dvl	\
 			 $(FEEDPAR)
 		
@@ -64,7 +64,7 @@ tstfeed	:  debug
 dbgfeed	:  debug
 	   @ gdb 					\
 		--args					\
-			bin/feeder			\
+			bin-utils/feeder		\
 			  -f				\
 			  -d 2				\
 			  -c ./conf/feeder.conf.dvl	\
@@ -77,7 +77,7 @@ valfeed	:  debug			#valgring of emlrcvr
 	   @ valgrind					\
 		--leak-check=full			\
 		--show-leak-kinds=$(VALKIND)		\
-			bin/feeder			\
+			bin-utils/feeder		\
 			  -f				\
 			  -d2				\
 			  -c ./conf/feeder.conf.dvl	\
diff --git a/Makefile.dbg b/Makefile.dbg
index e0503dd..4ea53fb 100644
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -77,7 +77,7 @@ onescar:  clean debug
 
 onefeed	:  debug
 	   @						\
-	         bin/feeder				\
+	         bin-utils/feeder			\
 			-f				\
 			-d 2				\
 	   		-c ./conf/$(APPNAME).conf.dvl	\
@@ -188,7 +188,6 @@ valscar:  clean debug
 		   -f					\
 		   $(DBGPAR)
 
-onefeed	:  debug
 TODO	=  `basename -a 				\
 	   $(TESTDIR)/var/spool/$(APPNAME)/queue/*.todo|\
 	    tr '\\n' ' ' `
diff --git a/app/Makefile b/app/Makefile
index 59bfd67..39d89d1 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -16,7 +16,6 @@ exe	:
 clean	:
 	   - rm -fr *.o $(EXE)
 	   - rm -fr ../bin-*
-	   - mkdir -p ../bin-posql ../bin-mysql
 
 #--------------------------------------------------------------------
 #Equivalences
@@ -65,7 +64,7 @@ LIBS	=  	$(LIBMAIL) 				\
 chkspf							\
 feeder							\
 	:  toremake $(OBJS)
-	   @ $(LD) $(LDFLAGS) -o ../bin-util/$@ $@.o $(LIBS)
+	   @ $(LD) $(LDFLAGS) -o ../bin-utils/$@ $@.o $(LIBS)
 
 receiver						\
 scanner							\
@@ -138,7 +137,7 @@ sender.o:  sender.c					\
 
 toremake:  Makefile
 	   touch toremake
-	   @ - mkdir -p ../bin-util
+	   @ - mkdir -p ../bin-utils
 	   @ - mkdir -p ../bin-posql
 	   @ - mkdir -p ../bin-mysql
 	   - rm -f $(EXE) *.o
diff --git a/data-feed/feed05.tst b/data-feed/feed05.tst
index 7b9f4be..35372c4 100644
--- a/data-feed/feed05.tst
+++ b/data-feed/feed05.tst
@@ -7,7 +7,7 @@ R:220 mailleur.example.com, ESMTP (cleartext) mailleur...
 S:helo example.com
 R:250 mailleur.example.com, link (cleartext) ready, your IP/FQDN=[91.199.160.44/painsmille.shop]
 S:MAIL FROM: <trouble@mailref1.example.com>
-R:457-4.5.7 Your Credential ( -1) need to be checked
+R:457-4.5.7 Your Credential need to be checked
 R:457 5.5.3 Closing connection
 R:Disconnected
 #-------------------------------------------------------------------------
diff --git a/lib/lvleml.c b/lib/lvleml.c
index b35ffd4..7e2a3b0 100644
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -355,9 +355,13 @@ while (proceed==true) {
       break;
     case 2      :       //freeing memory
       if (srv->credit<0) {
+        (void) log_fprintlog(contact->logptr,false,"Remote %s[%s] credit='%d' %s",
+                                                    contact->peername,
+                                                    contact->peerip,
+                                                    srv->credit,"too low");
         status=NEWSITE;
-        (void) transmit(contact,true,"%d-4.5.7 Your Credential (%3d) need "
-                                     "to be checked",status,srv->credit);
+        (void) transmit(contact,true,"%d-4.5.7 Your Credential need to be checked",
+                                      status);
         phase=999;      //To many server connected
         }
       break;
@@ -748,6 +752,7 @@ static _Bool getauth(CONTYP *contact,char *buffer)
 
 {
 #define OPEP    "lvleml.c:getauth,"
+#define DISP    "---- "
 
 static char *vocloc[]={"PLAIN","LOGIN","DIGEST-MD5",(char *)0};
 
@@ -825,10 +830,10 @@ while (proceed==true) {
       char *fmt;
       char *auth;
 
-      fmt="    Auth accepted for user=<%s>";
+      fmt=DISP"Auth accepted for user=<%s>";
       auth=contact->authname;
       if (contact->privilege!=rel_authentic) {
-        fmt="    Auth Rejected status='%d' for user=<%s> pass=<%s>";
+        fmt=DISP"Auth Rejected status='%d' for user=<%s> pass=<%s>";
         (void) log_fprintlog(contact->logptr,true,fmt,BADAUTH,auth,rmtpass);
         (void) sleep(2);
         (void) transmit(contact,true,"%d 5.7.4 authentication failed",BADAUTH);
@@ -847,6 +852,8 @@ while (proceed==true) {
   }
 rmtpass=rou_freestr(rmtpass);
 return (contact->privilege==rel_authentic);
+
+#undef  DISP
 #undef  OPEP
 }
 /*