Merge branch 'master'.

8 files changed, 33 insertions, 27 deletions

diff --git a/imap/ChangeLog b/imap/ChangeLog
index 93caab4..24d3ebc 100644
--- a/imap/ChangeLog
+++ b/imap/ChangeLog
@@ -1,3 +1,9 @@
+2020-10-27  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* waitlib: fix testwait.c failure with LTO enabled on F33.
+
+	* pop3login.c: fflush before STARTLS.
+
 5.0.11
 
 2020-05-18  Sam Varshavchik  <mrsam@courier-mta.com>
diff --git a/imap/courierpop3d.sgml b/imap/courierpop3d.sgml
index a25319c..92108e4 100644
--- a/imap/courierpop3d.sgml
+++ b/imap/courierpop3d.sgml
@@ -1,7 +1,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <!-- Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for -->
 <!-- distribution information. -->
-<refentry>
+<refentry id="courierpop3d">
   <info><author><firstname>Sam</firstname><surname>Varshavchik</surname><contrib>Author</contrib></author><productname>Courier Mail Server</productname></info>
 
   <refmeta>
@@ -29,7 +29,7 @@
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1>
+  <refsect1 id="courierpop3d_description">
     <title>DESCRIPTION</title>
 
     <para>
@@ -99,7 +99,7 @@ Usually, the default maildir is
 "<literal moreinfo="none">./Maildir</literal>".</para>
   </refsect1>
 
-  <refsect1>
+  <refsect1 id="courierpop3d_see_also">
     <title>SEE ALSO</title>
 
     <para>
diff --git a/imap/imapd.sgml b/imap/imapd.sgml
index e842c20..43b8ec3 100644
--- a/imap/imapd.sgml
+++ b/imap/imapd.sgml
@@ -1,7 +1,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <!-- Copyright 1998 - 2007 Double Precision, Inc.  See COPYING for -->
 <!-- distribution information. -->
-<refentry>
+<refentry id="imapd">
   <info><author><firstname>Sam</firstname><surname>Varshavchik</surname><contrib>Author</contrib></author><productname>Courier Mail Server</productname></info>
 
   <refmeta>
@@ -31,7 +31,7 @@
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1>
+  <refsect1 id="imapd_description">
     <title>DESCRIPTION</title>
 
     <para>
@@ -81,7 +81,7 @@ variable, then attempts to talk IMAP on standard input and output.</para>
 
   </refsect1>
 
-  <refsect1>
+  <refsect1 id="imapd_files_and_environment_variables">
     <title>FILES AND ENVIRONMENT VARIABLES</title>
 
     <variablelist>
@@ -136,7 +136,7 @@ Other environment variables are initialized from the
 These files are loaded into the environment by the system startup script
 that runs <command moreinfo="none">couriertcpd</command>.</para>
 
-    <refsect2>
+    <refsect2 id="imapd_realtime_concurrent_folder_status_updates">
       <title>Realtime concurrent folder status updates</title>
 
       <para>
@@ -310,7 +310,7 @@ in IDLE mode (instead of in real time).
       </variablelist>
     </refsect2>
 
-    <refsect2>
+    <refsect2 id="imapd_verifying_realtime_concurrent_folder_status_updates">
       <title>Verifying realtime concurrent folder status updates</title>
       <para>
 Use the following procedure to verify that realtime concurrent folder status
@@ -482,7 +482,7 @@ all terminal windows have the same <literal moreinfo="none">EXISTS</literal> mes
       </orderedlist>
     </refsect2>
   </refsect1>
-  <refsect1>
+  <refsect1 id="imapd_see_also">
     <title>SEE ALSO</title>
 
     <para>
diff --git a/imap/makeimapaccess.sgml b/imap/makeimapaccess.sgml
index a908891..8d53284 100644
--- a/imap/makeimapaccess.sgml
+++ b/imap/makeimapaccess.sgml
@@ -1,7 +1,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <!-- Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for -->
 <!-- distribution information. -->
-<refentry>
+<refentry id="makeimapaccess">
   <info><author><firstname>Sam</firstname><surname>Varshavchik</surname><contrib>Author</contrib></author><productname>Courier Mail Server</productname></info>
 
   <refmeta>
@@ -21,7 +21,7 @@
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1>
+  <refsect1 id="makeimapaccess_description">
     <title>DESCRIPTION</title>
 
     <para>
@@ -46,7 +46,7 @@
       describes the general format of access files.</para>
 
 
-    <refsect2>
+    <refsect2 id="makeimapaccess_the_imapaccess_configuration_file">
       <title>The <filename>imapaccess</filename> configuration file</title>
 
       <para>
@@ -64,7 +64,7 @@
     </refsect2>
   </refsect1>
 
-  <refsect1>
+  <refsect1 id="makeimapaccess_see_also">
     <title>SEE ALSO</title>
     <para>
       <ulink url="couriertcpd.html"><citerefentry><refentrytitle>couriertcpd</refentrytitle><manvolnum>8</manvolnum></citerefentry></ulink>.
diff --git a/imap/mkdhparams.sgml b/imap/mkdhparams.sgml
index c275829..1941278 100644
--- a/imap/mkdhparams.sgml
+++ b/imap/mkdhparams.sgml
@@ -1,7 +1,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <!-- Copyright 2013 Double Precision, Inc.  See COPYING for -->
 <!-- distribution information. -->
-<refentry>
+<refentry id="mkdhparams">
   <info><author><firstname>Sam</firstname><surname>Varshavchik</surname><contrib>Author</contrib></author><productname>Courier Mail Server</productname></info>
 
   <refmeta>
@@ -21,7 +21,7 @@
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1>
+  <refsect1 id="mkdhparams_description">
     <title>DESCRIPTION</title>
 
     <para>
@@ -38,7 +38,7 @@
     </para>
   </refsect1>
 
-  <refsect1>
+  <refsect1 id="mkdhparams_files">
     <title>FILES</title>
 
     <variablelist>
@@ -53,7 +53,7 @@
     </variablelist>
   </refsect1>
 
-  <refsect1>
+  <refsect1 id="mkdhparams_environment_variables">
     <title>ENVIRONMENT VARIABLES</title>
 
     <variablelist>
@@ -79,7 +79,7 @@
     </para>
   </note>
 
-  <refsect1>
+  <refsect1 id="mkdhparams_see_also">
     <title>SEE ALSO</title>
 
     <para>
diff --git a/imap/mkimapdcert.sgml b/imap/mkimapdcert.sgml
index 6b1c2f8..d367e13 100644
--- a/imap/mkimapdcert.sgml
+++ b/imap/mkimapdcert.sgml
@@ -1,7 +1,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <!-- Copyright 2000 - 2007 Double Precision, Inc.  See COPYING for -->
 <!-- distribution information. -->
-<refentry>
+<refentry id="mkimapdcert">
   <info><author><firstname>Sam</firstname><surname>Varshavchik</surname><contrib>Author</contrib></author><productname>Courier Mail Server</productname></info>
 
   <refmeta>
@@ -21,7 +21,7 @@
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1>
+  <refsect1 id="mkimapdcert_description">
     <title>DESCRIPTION</title>
 
     <para>
@@ -50,7 +50,7 @@ will not work if <command moreinfo="none">@certsdir@/imapd.pem</command> already
 
   </refsect1>
 
-  <refsect1>
+  <refsect1 id="mkimapdcert_files">
     <title>FILES</title>
 
     <variablelist>
@@ -74,7 +74,7 @@ create the X.509 certificate.
       </varlistentry>
     </variablelist>
   </refsect1>
-  <refsect1>
+  <refsect1 id="mkimapdcert_see_also">
     <title>SEE ALSO</title>
 
     <para>
diff --git a/imap/mkpop3dcert.sgml b/imap/mkpop3dcert.sgml
index abd4258..137c1c4 100644
--- a/imap/mkpop3dcert.sgml
+++ b/imap/mkpop3dcert.sgml
@@ -1,7 +1,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <!-- Copyright 2000 - 2007 Double Precision, Inc.  See COPYING for -->
 <!-- distribution information. -->
-<refentry>
+<refentry id="mkpop3dcert">
   <info><author><firstname>Sam</firstname><surname>Varshavchik</surname><contrib>Author</contrib></author><productname>Courier Mail Server</productname></info>
 
   <refmeta>
@@ -21,7 +21,7 @@
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1>
+  <refsect1 id="mkpop3dcert_description">
     <title>DESCRIPTION</title>
 
     <para>
@@ -50,7 +50,7 @@ will not work if <command moreinfo="none">@datadir@/pop3d.pem</command> already
 
   </refsect1>
 
-  <refsect1>
+  <refsect1 id="mkpop3dcert_files">
     <title>FILES</title>
 
     <variablelist>
@@ -74,7 +74,7 @@ create the X.509 certificate.
       </varlistentry>
     </variablelist>
   </refsect1>
-  <refsect1>
+  <refsect1 id="mkpop3dcert_see_also">
     <title>SEE ALSO</title>
 
     <para>
diff --git a/imap/pop3login.c b/imap/pop3login.c
index 611e927..5a67fda 100644
--- a/imap/pop3login.c
+++ b/imap/pop3login.c
@@ -100,7 +100,7 @@ static int	starttls()
 		exit(1);
 	}
 	close(pipefd[0]);
-
+	fflush(stdin);
 	putenv("POP3_STARTTLS=NO");
 	putenv("POP3_TLS_REQUIRED=0");
 	putenv("POP3_TLS=1");