[SCM] GNU Mailutils branch, master, updated. release-2.2-667-gabfca75

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=abfca75219cf61603d8befa90e4cf01d5ab5eabf

The branch, master has been updated
       via  abfca75219cf61603d8befa90e4cf01d5ab5eabf (commit)
      from  27b6965a55e7b81eeb4029748b38f207fea75c2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit abfca75219cf61603d8befa90e4cf01d5ab5eabf
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Feb 4 14:09:18 2014 +0200

    Use global TLS setting in inetd mode (bug #40891)
    
    * imap4d/imap4d.c (imap4d_connection): Use global TLS setting if
    no local one was supplied.
    (main): Use global TLS setting in inetd mode.
    * pop3d/pop3d.c (main): Use global TLS setting in inetd mode.

-----------------------------------------------------------------------

Summary of changes:
 imap4d/imap4d.c |    5 +++--
 pop3d/pop3d.c   |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 2e82a04..7a4491e 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -738,7 +738,8 @@ imap4d_connection (int fd, struct sockaddr *sa, int salen,
   else
     rc = 1;
   
-  imap4d_mainloop (fd, fd, cfg->tls_mode);
+  imap4d_mainloop (fd, fd, 
+                   cfg->tls_mode == tls_unspecified ? tls_mode : 
cfg->tls_mode);
 
   if (rc == 0)
     clr_strerr_flt ();
@@ -934,7 +935,7 @@ main (int argc, char **argv)
     {
       /* Make sure we are in the root directory.  */
       chdir ("/");
-      status = imap4d_mainloop (MU_STDIN_FD, MU_STDOUT_FD, 0);
+      status = imap4d_mainloop (MU_STDIN_FD, MU_STDOUT_FD, tls_mode);
     }
 
   if (status)
diff --git a/pop3d/pop3d.c b/pop3d/pop3d.c
index 3e307f7..8173344 100644
--- a/pop3d/pop3d.c
+++ b/pop3d/pop3d.c
@@ -668,7 +668,7 @@ main (int argc, char **argv)
     {
       /* Make sure we are in the root directory.  */
       chdir ("/");
-      status = pop3d_mainloop (MU_STDIN_FD, MU_STDOUT_FD, tls_no);
+      status = pop3d_mainloop (MU_STDIN_FD, MU_STDOUT_FD, tls_mode);
     }
   
   if (status)


hooks/post-receive
-- 
GNU Mailutils