diff options
| author | Sam Varshavchik | 2020-04-20 08:07:11 -0400 |
|---|---|---|
| committer | Sam Varshavchik | 2020-04-20 08:11:04 -0400 |
| commit | 980b2591fcf4d637da610057f05cacb7800de4e7 (patch) | |
| tree | cca9414025df9ad99976e01eb0ac88446d0a79e4 | |
| parent | dac56c010aad8943b85776c0c1f4d1c30064a2be (diff) | |
| download | courier-libs-980b2591fcf4d637da610057f05cacb7800de4e7.tar.bz2 | |
Fix regression with user parameter
| -rw-r--r-- | imap/ChangeLog | 2 | ||||
| -rw-r--r-- | tcpd/starttls.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog index 3076ca9..881e240 100644 --- a/imap/ChangeLog +++ b/imap/ChangeLog @@ -1,3 +1,5 @@ +5.0.10 + 2020-02-25 FlorianMickler <florian@mickler.org> * tcpd/starttls.c (dossl): Start client after negotiating SSL, diff --git a/tcpd/starttls.c b/tcpd/starttls.c index 94cb3ac..e7b805f 100644 --- a/tcpd/starttls.c +++ b/tcpd/starttls.c @@ -542,9 +542,6 @@ static int dossl(int fd, int argn, int argc, char **argv) stdin_fd=0; stdout_fd=1; - if (username) - libmail_changeusername(username, 0); - ctx=tls_create(server ? 1:0, &info); if (ctx == 0) return (1); @@ -566,6 +563,9 @@ static int dossl(int fd, int argn, int argc, char **argv) startclient(argn, argc, argv, fd, &stdin_fd, &stdout_fd); + if (username) + libmail_changeusername(username, 0); + docopy(ssl, fd, stdin_fd, stdout_fd); tls_disconnect(ssl, fd); |