Attachment 204111 Details for Bug 284801 – A backported patch

[patch] A backported patch

stunnel-4.15-smtp.patch (text/plain), 1.60 KB, created by Miloslav Trmač on 2007-09-24 12:55:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miloslav Trmač

Created: 2007-09-24 12:55:15 UTC

Size: 1.60 KB

patch

obsolete

>diff -up stunnel-4.15/src/protocol.c~ stunnel-4.15/src/protocol.c
>--- stunnel-4.15/src/protocol.c~	2007-09-24 14:42:59.000000000 +0200
>+++ stunnel-4.15/src/protocol.c	2007-09-24 14:43:01.000000000 +0200
>@@ -176,7 +176,7 @@ static void smtp_server(CLI *c) {
>         s_log(LOG_ERR, "Unknown server welcome");
>         longjmp(c->err, 1);
>     }
>-    fdprintf(c, c->local_wfd.fd, "220%s + stunnel", line);
>+    fdprintf(c, c->local_wfd.fd, "%s + stunnel", line);
>     fdgetline(c, c->local_rfd.fd, line);
>     if(!isprefix(line, "EHLO ")) {
>         s_log(LOG_ERR, "Unknown client EHLO");
>diff -up stunnel-4.15/src/network.c~ stunnel-4.15/src/network.c
>--- stunnel-4.15/src/network.c~	2006-03-01 15:41:08.000000000 +0100
>+++ stunnel-4.15/src/network.c	2007-09-24 14:37:24.000000000 +0200
>@@ -554,18 +554,21 @@ void read_blocking(CLI *c, int fd, u8 *p
> }
> 
> void fdputline(CLI *c, int fd, char *line) {
>-    char logline[STRLEN];
>+    char tmpline[STRLEN];
>     const char crlf[]="\r\n";
>+    int len;
> 
>     if(strlen(line)+2>=STRLEN) { /* 2 for crlf */
>         s_log(LOG_ERR, "Line too long in fdputline");
>         longjmp(c->err, 1);
>     }
>-    safecopy(logline, line); /* the line without crlf */
>-    safeconcat(line, crlf);
>-    write_blocking(c, fd, line, strlen(line));
>-    safestring(logline);
>-    s_log(LOG_DEBUG, " -> %s", logline);
>+    safecopy(tmpline, line);
>+    safeconcat(tmpline, crlf);
>+    len=strlen(tmpline);
>+    write_blocking(c, fd, tmpline, len);
>+    tmpline[len-2]='\0'; /* remove CRLF */
>+    safestring(tmpline);
>+    s_log(LOG_DEBUG, " -> %s", tmpline);
> }
> 
> void fdgetline(CLI *c, int fd, char *line) {

Actions: View | Diff

Attachments on bug 284801: 204111