From aadac6c2437f09bc1709ccbe0fd5d0f204c3bb4f Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 27 Jul 2026 18:41:15 +0200
Subject: [PATCH] smtp: disable retired outbound queue consumer

---
 src/agents/smtp/smtpd.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/agents/smtp/smtpd.c b/src/agents/smtp/smtpd.c
index 09af205..eba6167 100644
--- a/src/agents/smtp/smtpd.c
+++ b/src/agents/smtp/smtpd.c
@@ -860,15 +860,9 @@ void *SMTPConnectionPool = NULL;
 
 /* Prototypes */
 long ReadConnection(Connection *conn, char **buffer, unsigned long *buflen);
-void ProcessRemoteEntry (ConnectionStruct * Client, unsigned long Size, int Lines);
 int RewriteAddress (Connection * conn, const char *Source, char *Target, unsigned int TargetSize);
 BOOL FlushClient (ConnectionStruct * Client);
 BOOL EndClientConnection (ConnectionStruct * Client);
-static int PullLine (char *Line, unsigned long LineSize, char **NextLine);
-/* this PullLine will strip off the crlf where the other one only seems to strip off the lf
- * eventually i'd like to remove the first and convert everything to using the straight connio
- * stuff for speed and security */
-static int PullLine2 (char *Line, unsigned long LineSize, char **NextLine);
 
 static BOOL
 SMTPConnectionAllocCB (void *Buffer, void *ClientData)
@@ -2847,6 +2841,13 @@ HandleConnection (void *param)
 												}
 
 
+/*
+ * The original SMTP agent also contained a Queue consumer and outbound SMTP
+ * client.  bongosmtpc has replaced that path and is the sole Q_OUTGOING
+ * consumer.  Keep this block out of the binary until the historical code is
+ * removed from the source file in a dedicated cleanup.
+ */
+#if 0
 static int
 GetEHLO(ConnectionStruct *Client, unsigned int *Extensions,
         uint64_t *Size)
@@ -3584,6 +3585,7 @@ finish:
 
     return (RetVal);
 }
+#endif
 
 int
 RewriteAddress(Connection * conn, const char *Source, char *Target, unsigned int TargetSize)
@@ -3781,6 +3783,7 @@ RewriteAddress(Connection * conn, const char *Source, char *Target, unsigned int
     return (RetVal);
 }
 
+#if 0
 #define	QuickCmpToUpper(check,result)		result=check & 0xdf;
 
 static int
@@ -4926,6 +4929,7 @@ QueueServerStartup (void *ignored)
 
     return;
 }
+#endif
 
 static void
 SMTPShutdownSigHandler (int sigtype)
@@ -5783,8 +5787,6 @@ int XplServiceMain (int argc, char *argv[])
         return 1;
     }
 
-//    XplBeginCountedThread (&ID, QueueServerStartup, STACKSIZE_Q, NULL, ccode, SMTPServerThreads);
-
     if (SMTP.allow_client_ssl || SMTP.submission_enabled) {
         if (!ServerSocketSSLInit()) {
             ConnSSLConfiguration sslconfig;