Small adjustment about messaging

diff --git a/Makefile b/Makefile
index ec8bfcaaf2bebf729bf45856972eae6089f958f4..0cd31477010e14b5d3291f747c576c528cd12d74 100644 (file)
--- 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 e0503dddb00a8462acbd6c1368cf4c5b7eff0dd9..4ea53fb9f1bf8e3dbedb6d67dd19ce21c23798c3 100644 (file)
--- 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 59bfd679a79d9db9f178507ff1da3c1c4471772a..39d89d1de75be5340c14d9b8df30520bff002c92 100644 (file)
--- 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 7b9f4beafbce665f343aba70c7d39499ee5ebd88..35372c429d8b36a877d9a27fb8e30369fcb17481 100644 (file)
--- 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 b35ffd47c4bcb0e387020e32b72bafcc68631835..7e2a3b0cad2ab165fab0c7875c26b60d098bea02 100644 (file)
--- 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
 }
 /*