From dbfa635dd44b64670d5370bd5fd1bf556de778a5 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 26 Oct 2010 21:34:32 +0200
Subject: [PATCH] * sock_getln (): CtdlSockGetLine() gives us lines without
 \r\n, no need to look for them again * sock_getln_err (): add integer pointer
 returning the actual return state in case of error * ml_sock_gets (): use
 sock_getln_err () so we can abort on impropper replies * smtp_try (): make
 socket nonblocking, so we can abort on error  -> we will wait 5 seconds for
 the remote site to send us the SMTP-State else we will abort the connection
 on failure.

---
 citadel/clientsocket.c           | 50 +++++++++++++++++++++++---------
 citadel/modules/smtp/serv_smtp.c | 16 +++++++++-
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 1f66a261b..49dee67b2 100644
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -201,17 +201,8 @@ int sock_getln(int *sock, char *buf, int bufsize)
 
 	i = StrLength(CCC->sMigrateBuf);
 	pCh = ChrPtr(CCC->sMigrateBuf);
-	/* Strip the trailing LF, and the trailing CR if present.
-	 */
-	if (bufsize <= i)
-		i = bufsize - 1;
-	while ((i > 0)
-	       && ((pCh[i - 1] == 13)
-		   || (pCh[i - 1] == 10))) {
-		i--;
-	}
-	memcpy(buf, pCh, i);
-	buf[i] = 0;
+
+	memcpy(buf, pCh, i + 1);
 
 	FlushStrBuf(CCC->sMigrateBuf);
 	if (retval < 0) {
@@ -257,6 +248,34 @@ int sock_write(int *sock, const char *buf, int nbytes)
 }
 
 
+
+/*
+ * client_getln()   ...   Get a LF-terminated line of text from the client.
+ * (This is implemented in terms of client_read() and could be
+ * justifiably moved out of sysdep.c)
+ */
+int sock_getln_err(int *sock, char *buf, int bufsize, int *rc)
+{
+	int i, retval;
+	CitContext *CCC = MyContext();
+	const char *pCh;
+
+	FlushStrBuf(CCC->sMigrateBuf);
+	*rc = retval = CtdlSockGetLine(sock, CCC->sMigrateBuf);
+
+	i = StrLength(CCC->sMigrateBuf);
+	pCh = ChrPtr(CCC->sMigrateBuf);
+
+	memcpy(buf, pCh, i + 1);
+
+	FlushStrBuf(CCC->sMigrateBuf);
+	if (retval < 0) {
+		safestrncpy(&buf[i], "000", bufsize - i);
+		i += 3;
+	}
+	return i;
+}
+
 /*
  * Multiline version of sock_gets() ... this is a convenience function for
  * client side protocol implementations.  It only returns the first line of
@@ -264,17 +283,22 @@ int sock_write(int *sock, const char *buf, int nbytes)
  */
 int ml_sock_gets(int *sock, char *buf)
 {
+	int rc = 0;
 	char bigbuf[1024];
 	int g;
 
-	g = sock_getln(sock, buf, SIZ);
+	g = sock_getln_err(sock, buf, SIZ, &rc);
+	if (rc < 0)
+		return rc;
 	if (g < 4)
 		return (g);
 	if (buf[3] != '-')
 		return (g);
 
 	do {
-		g = sock_getln(sock, bigbuf, SIZ);
+		g = sock_getln_err(sock, bigbuf, SIZ, &rc);
+		if (rc < 0)
+			return rc;
 		if (g < 0)
 			return (g);
 	} while ((g >= 4) && (bigbuf[3] == '-'));
diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index ab01bbd7d..3c5e02c0a 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -1081,7 +1081,21 @@ void smtp_try(const char *key, const char *addr, int *status,
 		CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connecting to %s : %s ...\n", mx_host, mx_port);
 		sock = sock_connect(mx_host, mx_port);
 		snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));
-		if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connected!\n");
+		if (sock >= 0) 
+		{
+			CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connected!\n");
+				int fdflags; 
+				fdflags = fcntl(sock, F_GETFL);
+				if (fdflags < 0)
+					CtdlLogPrintf(CTDL_DEBUG,
+						      "unable to get SMTP-Client socket flags! %s \n",
+						      strerror(errno));
+				fdflags = fdflags | O_NONBLOCK;
+				if (fcntl(sock, F_SETFL, fdflags) < 0)
+					CtdlLogPrintf(CTDL_DEBUG,
+						      "unable to set SMTP-Client socket nonblocking flags! %s \n",
+						      strerror(errno));
+		}
 		if (sock < 0) {
 			if (errno > 0) {
 				snprintf(dsn, SIZ, "%s", strerror(errno));
-- 
2.30.2