md5 bad authentication is working fine

diff --git a/Notes b/Notes
index 021cfd34080f086b340f8607d899967c7786eaaa..33bbff07350e6d266467493095bbb566fb133812 100644 (file)
--- a/Notes
+++ b/Notes
@@ -12,3 +12,8 @@ status can be:
        L       local           ;Email stay on local serveur
        R       Remote          ;email is to be sent on remote site
 #-----------------------------------------------------------
+#b64 Exchange
+cmVhbG09Im1haWxsZXVyLWVtYWlsIixub25jZT0iTVd0dlVIWlZhVzV3ZDJSWGJFZEtTWEJGTVZSbFRHbGljazVpYTIxQiIscW9wPWF1dGgsYWxnb3JpdGhtPW1kNS1zZXNzLGNoYXJzZXQ9dXRmLTg=
+
+dXNlcm5hbWU9ImRpZ2kiLHJlYWxtPSJtYWlsbGV1ci1lbWFpbCIsbm9uY2U9Ik1XdHZVSFpWYVc1d2QyUlhiRWRLU1hCRk1WUmxUR2xpY2s1aWEyMUIiLGNub25jZT0iNU1TQ2Z5YUN0WWxES2c2YkVhK0kiLG5jPTAwMDAwMDAxLHFvcD0iYXV0aCIsZGlnZXN0LXVyaT0ic210cC8xOTIuMjE5LjI1NC4xODEiLHJlc3BvbnNlPWQxYTFlOGFmMDUzZmJhNmQzY2NhMzg3NmQ2YWY1N2ExLGNoYXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNz
+#-----------------------------------------------------------

diff --git a/data-feed/feed011.tst b/data-feed/feed011.tst
index 83af9e1e008419bf399259a36fe0b161faee8bb7..d99eea439cd48b112326c8ced24abf54cb94f8fb 100644 (file)
--- a/data-feed/feed011.tst
+++ b/data-feed/feed011.tst
@@ -2,26 +2,7 @@ T:(feed011) Checkin authentication mode is AUTH DISGEST-MDr5
 C:CONNECT
 R:220 mailleur.example.com, ESMTP (cleartext) mailleur...
 S:AUTH DIGEST-MD5
-R:334 cmVhbG09Im1haWxsZXVyLWVtYWlsIixub25jZT0iU1ZReVpRPT0iLHFvcD1hdXRoLGFsZ29yaXRobT1tZDUtc2VzcyxjaGFyc2V0PXV0Zi04
-S:AUTH PLAIN YXV0aGlkXDB3ZWJtYXN0ZXJAZXhhbXBsZS5jb21cMG1haWxsZXVy
-R:235 5.7.5 Authentication successful
-S:AUTH LOGIN
-#requesting Username:
-R:334 VXNlcm5hbWU6
-#sending 'webmaster@example.com' as B64
-S:d2VibWFzdGVyQGV4YW1wbGUuY29t
-#requesting Password:
-R:334 UGFzc3dvcmQ6
-#sending 'mailleur' as B64
-S:bWFpbGxldXI=
-R:235 5.7.5 Authentication successful
-S:AUTH PLAIN AHVzZXIxQG1haWxwb3N0Zy5leGFtcGxlLmNvbQBtYWlsbGV1cg==
-R:504 5.7.4 authentication failed
-#\0bigre_bigre\0nouser
-S:AUTH PLAIN XDBiaWdyZV9iaWdyZVwwbm91c2Vy
-R:504 5.7.4 authentication failed
-#\0postmaster@example.com\0nopasswd
-S:AUTH PLAIN XDBwb3N0bWFzdGVyQGV4YW1wbGUuY29tXDBub3Bhc3N3ZA==
-R:504 5.7.4 authentication failed
-S:QUIT
-R:221 2.0.0 Bye, closing connection...
+R:334 cmVhbG09Im1ha...
+S:dXNlcm5hbWU9ImRpZ2kiLHJlYWxtPSJtYWlsbGV1ci1lbWFpbCIsbm9uY2U9Ik1XdHZVSFpWYVc1d2QyUlhiRWRLU1hCRk1WUmxUR2xpY2s1aWEyMUIiLGNub25jZT0iNU1TQ2Z5YUN0WWxES2c2YkVhK0kiLG5jPTAwMDAwMDAxLHFvcD0iYXV0aCIsZGlnZXN0LXVyaT0ic210cC8xOTIuMjE5LjI1NC4xODEiLHJlc3BvbnNlPWQxYTFlOGFmMDUzZmJhNmQzY2NhMzg3NmQ2YWY1N2ExLGNoYXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNz
+R:504 5.7.4 wrong authentication
+R:Disconnected

diff --git a/lib/lvleml.c b/lib/lvleml.c
index e1dda7e919bfe127d01761025911488d1f713377..8c3f2b6af3127cf789fbe08cffdf53961ecad91b 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -658,7 +658,6 @@ while (proceed==true) {
       char *b64;
 
       b64=cnv_setb64(challenge);
-      (void) rou_alert(0,"JMPDBG md5 send=<%d %s>",SENDB64,b64);
       (void) eml_transmit(contact,true,"%d %s",SENDB64,b64);
       b64=rou_freestr(b64);
       }
@@ -671,7 +670,6 @@ while (proceed==true) {
         if (strcasecmp(line,"QUIT")!=0) {
           char *res;
 
-          (void) rou_alert(0,"JMPDBG md5 received=<%s>",line);
           res=cnv_getb64(line);
           (void) rou_alert(2,"%s received=<%s>",OPEP,res);
           (void) snprintf(answer,sizeof(answer),"%s",res);
@@ -882,7 +880,7 @@ while (proceed==true) {
         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) eml_note(contact,NULL,"user <%s> pass=<%s> bad authentication",
+        (void) eml_note(contact,NULL,"000 user <%s> pass=<%s> bad authentication",
                                       auth,rmtpass);
         (void) eml_transmit(contact,true,"%d 5.7.4 wrong authentication",BADAUTH);
         contact->credit-=1;