diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-03-23 16:52:33 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-03-23 16:52:33 +0200 |
| commit | 9f9d7b0b7cdb586b34ff08bfa7c752d05088a720 (patch) | |
| tree | e03091500515047b898519d243906d1041d383c5 /pop3d | |
| parent | bf8b7ff08f0c13e99ff39b49ce7bb3d34ec9a97a (diff) | |
| download | mailutils-9f9d7b0b7cdb586b34ff08bfa7c752d05088a720.tar.gz mailutils-9f9d7b0b7cdb586b34ff08bfa7c752d05088a720.tar.bz2 | |
Fix semantics of MU_IOCTL_SUBSTREAM.
This also fixes e75e9123, which broke TLS support in daemons.
* include/mailutils/stream.h (MU_IOCTL_TOPSTREAM): New ioctl.
* imap4d/imap4d.c (set_strerr_flt)
(clr_strerr_flt): Use MU_IOCTL_TOPSTREAM.
* pop3d/pop3d.c: Likewise.
* libmailutils/stream/fltstream.c (filter_ctl): Handle both
MU_IOCTL_SUBSTREAM and MU_IOCTL_TOPSTREAM.
* libmailutils/stream/iostream.c (_iostream_ctl): Likewise.
* libmailutils/stream/logstream.c (_log_ctl): Likewise.
* libmailutils/stream/xscript-stream.c (_xscript_ctl): Likewise.
Diffstat (limited to 'pop3d')
| -rw-r--r-- | pop3d/pop3d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pop3d/pop3d.c b/pop3d/pop3d.c index 223db3560..efe4155b5 100644 --- a/pop3d/pop3d.c +++ b/pop3d/pop3d.c @@ -372,7 +372,7 @@ set_strerr_flt () mu_stream_t flt, trans[2]; int rc; - rc = mu_stream_ioctl (mu_strerr, MU_IOCTL_SUBSTREAM, MU_IOCTL_OP_GET, trans); + rc = mu_stream_ioctl (mu_strerr, MU_IOCTL_TOPSTREAM, MU_IOCTL_OP_GET, trans); if (rc == 0) { char sessidstr[10]; @@ -389,7 +389,7 @@ set_strerr_flt () mu_stream_set_buffer (flt, mu_buffer_line, 0); trans[0] = flt; trans[1] = NULL; - rc = mu_stream_ioctl (mu_strerr, MU_IOCTL_SUBSTREAM, + rc = mu_stream_ioctl (mu_strerr, MU_IOCTL_TOPSTREAM, MU_IOCTL_OP_SET, trans); mu_stream_unref (trans[0]); if (rc) @@ -413,16 +413,16 @@ clr_strerr_flt () mu_stream_t flt, trans[2]; int rc; - rc = mu_stream_ioctl (mu_strerr, MU_IOCTL_SUBSTREAM, MU_IOCTL_OP_GET, trans); + rc = mu_stream_ioctl (mu_strerr, MU_IOCTL_TOPSTREAM, MU_IOCTL_OP_GET, trans); if (rc == 0) { flt = trans[0]; - rc = mu_stream_ioctl (flt, MU_IOCTL_SUBSTREAM, MU_IOCTL_OP_GET, trans); + rc = mu_stream_ioctl (flt, MU_IOCTL_TOPSTREAM, MU_IOCTL_OP_GET, trans); if (rc == 0) { mu_stream_unref (trans[0]); - rc = mu_stream_ioctl (mu_strerr, MU_IOCTL_SUBSTREAM, + rc = mu_stream_ioctl (mu_strerr, MU_IOCTL_TOPSTREAM, MU_IOCTL_OP_SET, trans); if (rc == 0) mu_stream_unref (flt); |