diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c index e56de1c0fa2312119372307851607f390fbcd9a5..d953848abd071eb8e040b05007c25b1d0f6fc839 100644 --- a/src/sbbs3/ftpsrvr.c +++ b/src/sbbs3/ftpsrvr.c @@ -297,7 +297,7 @@ static int ftp_close_socket(SOCKET* sock, CRYPT_SESSION *sess, int line) int GCES_level; \ get_crypt_error_string(status, session, &estr, action, &GCES_level);\ if (estr) { \ - lprintf(GCES_level, "%04d %s", sock, estr); \ + lprintf(GCES_level, "%04d TLS %s", sock, estr); \ free_crypt_attrstr(estr); \ } \ } while (0) diff --git a/src/sbbs3/js_socket.c b/src/sbbs3/js_socket.c index 9e4518b881e7424e60cacf48bb8cf6aee0684200..69755f4838b6e1a5fb4fdbd6e21f0b75f3068b21 100644 --- a/src/sbbs3/js_socket.c +++ b/src/sbbs3/js_socket.c @@ -67,7 +67,7 @@ static int do_cryptAttribute(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_TYPE a if(ret != CRYPT_OK) { get_crypt_error_string(ret, session, &estr, "setting attribute", &level); if (estr) { - lprintf(level, "%s", estr); + lprintf(level, "TLS %s", estr); free_crypt_attrstr(estr); } } @@ -83,7 +83,7 @@ static int do_cryptAttributeString(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_ if(ret != CRYPT_OK) { get_crypt_error_string(ret, session, &estr, "setting attribute string", &level); if (estr) { - lprintf(level, "%s", estr); + lprintf(level, "TLS %s", estr); free_crypt_attrstr(estr); } } @@ -94,7 +94,7 @@ static int do_cryptAttributeString(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_ int GCES_level; \ get_crypt_error_string(status, pdata->session, &estr, action, &GCES_level); \ if (estr) { \ - lprintf(GCES_level, "%04d %s", p->sock, estr); \ + lprintf(GCES_level, "%04d TLS %s", p->sock, estr); \ free_crypt_attrstr(estr); \ } \ } while(0) @@ -103,7 +103,7 @@ static int do_cryptAttributeString(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_ int GCESH_level; \ get_crypt_error_string(status, handle, &estr, action, &GCESH_level); \ if (estr) { \ - lprintf(GCESH_level, "%04d %s", socket, estr); \ + lprintf(GCESH_level, "%04d TLS %s", socket, estr); \ free_crypt_attrstr(estr); \ } \ } while(0) diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c index e6d147704fd61997cd8e4d972a7c11f10ddcaf4f..1cc98dacea2910ad9c5d48befe0535c60be86288 100644 --- a/src/sbbs3/mailsrvr.c +++ b/src/sbbs3/mailsrvr.c @@ -149,7 +149,7 @@ typedef struct { int GCES_level; \ get_crypt_error_string(status, sess, &GCES_estr, action, &GCES_level); \ if (GCES_estr) { \ - lprintf(GCES_level, "%04d %s%s", sock, server, GCES_estr); \ + lprintf(GCES_level, "%04d %s/TLS %s", sock, server, GCES_estr); \ free_crypt_attrstr(GCES_estr); \ } \ } while(0) @@ -159,7 +159,7 @@ typedef struct { int GCES_level; \ get_crypt_error_string(status, sess, &GCES_estr, action, &GCES_level); \ if (GCES_estr) { \ - lprintf(GCES_level, "%04d %s [%s] %s", sock, server, host, GCES_estr); \ + lprintf(GCES_level, "%04d %s/TLS [%s] %s", sock, server, host, GCES_estr); \ free_crypt_attrstr(GCES_estr); \ } \ } while(0) diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c index 205d93748f625299f99b9d0fd3c692fac69aa22b..14f37d3623e14b327084cfad1d0cc81a958815fc 100644 --- a/src/sbbs3/services.c +++ b/src/sbbs3/services.c @@ -943,7 +943,7 @@ static BOOL handle_crypt_call(int status, service_client_t *service_client, cons sess = CRYPT_UNUSED; get_crypt_error_string(status, sess, &estr, action, &level); if (estr) { - lprintf(level, "%04d %s", sock, estr); + lprintf(level, "%04d %s/TLS %s", sock, service_client->service->protocol, estr); free_crypt_attrstr(estr); } } diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c index e2b65c5f03801d0a9071566192ba35a16f0edb26..130bd01811be65adca0a63af3130ad5af10dcfe5 100644 --- a/src/sbbs3/websrvr.c +++ b/src/sbbs3/websrvr.c @@ -394,13 +394,13 @@ enum { ,MOVED_STAT }; -#define GCES(status, sess, action) do { \ +#define GCES(status, sess, action) do { \ char *GCES_estr; \ int GCES_level; \ get_crypt_error_string(status, sess->tls_sess, &GCES_estr, action, &GCES_level);\ if (GCES_estr) { \ - lprintf(GCES_level, "%04d %s", sess->socket, GCES_estr); \ - free_crypt_attrstr(GCES_estr); \ + lprintf(GCES_level, "%04d TLS %s", sess->socket, GCES_estr); \ + free_crypt_attrstr(GCES_estr); \ } \ } while (0)