tidying

diff --git a/src/src/log.c b/src/src/log.c
index 6c483216ad61d79989e48351adc5342e69b68811..a01e9c59f20bda6698b73c30655c11354c520a9a 100644 (file)
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -1544,6 +1544,7 @@ else DEBUG(D_deliver)
 void
 debug_logging_stop(BOOL kill)
 {
 void
 debug_logging_stop(BOOL kill)
 {

+debug_printf("debug terminated by %s\n", kill ? "kill" : "stop");

 debug_pretrigger_discard();
 if (!debug_file || !debuglog_name[0]) return;
 
 debug_pretrigger_discard();
 if (!debug_file || !debuglog_name[0]) return;
 

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index eabe34f3159584a7801c238fd8edd3680e143805..db77a127454c707798465839314b7bb0a66e075f 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -3999,7 +3999,7 @@ if (tlsp->host_resumable)
     tls_error(US"set ex_data", host, NULL, errstr);
     return FALSE;
     }
     tls_error(US"set ex_data", host, NULL, errstr);
     return FALSE;
     }

-  debug_printf("tls_exdata_idx %d cbinfo %p\n", tls_exdata_idx, client_static_state);
+  /* debug_printf("tls_exdata_idx %d cbinfo %p\n", tls_exdata_idx, client_static_state); */

   }
 
 tlsp->resumption = RESUME_SUPPORTED;
   }
 
 tlsp->resumption = RESUME_SUPPORTED;

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 1183fa478751e55a319b075c6e8667f39a613ac8..ed5f83b3ee939c294209909abe354fdb007e10c8 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -990,7 +990,7 @@ return FALSE;
 
 
 /* Return an auths bitmap for the set of AUTH methods offered by the server
 
 
 /* Return an auths bitmap for the set of AUTH methods offered by the server

-which match our authenticators. */
+which match our client-side authenticators. */

 
 static unsigned short
 study_ehlo_auths(smtp_context * sx)
 
 static unsigned short
 study_ehlo_auths(smtp_context * sx)


@@ -1016,7 +1016,7 @@ for (au = auths, authnum = 0; au; au = au->next, authnum++) if (au->client)
   }
 
 DEBUG(D_transport)
   }
 
 DEBUG(D_transport)

-  debug_printf("server offers %s AUTH, methods '%s', bitmap 0x%04x\n",
+  debug_printf("server offers %s AUTH, methods '%s', usable-bitmap 0x%04x\n",

     tls_out.active.sock >= 0 ? "crypted" : "plaintext", names, authbits);
 
 if (tls_out.active.sock >= 0)
     tls_out.active.sock >= 0 ? "crypted" : "plaintext", names, authbits);
 
 if (tls_out.active.sock >= 0)

diff --git a/test/scripts/0000-Basic/0628 b/test/scripts/0000-Basic/0628
index e5f37771ba9fdda5d6a269a83501226a6b9d0099..a78d512a176d616836c76961e2512b33d460df20 100644 (file)
--- a/test/scripts/0000-Basic/0628
+++ b/test/scripts/0000-Basic/0628
@@ -62,6 +62,7 @@ exim -DNOTDAEMON -DSERVER=server -q
 killdaemon
 #
 #
 killdaemon
 #
 #

+# This file should have been written, then removed by the debug/kill in rcpt acl

 1
 cat DIR/spool/log/serverdebuglog_1
 #
 1
 cat DIR/spool/log/serverdebuglog_1
 #