From 2823db773343d61594cfa5e25a9759df5abcd540 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sat, 14 Jan 2006 23:26:17 +0000
Subject: [PATCH] config: Correct forged From: lines during authenticated SMTP

---
 webcit/ChangeLog    |  3 +++
 webcit/siteconfig.c | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 6edb32418..a7e2cd773 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -3,6 +3,9 @@ $Id$
 Fri Jan 13 15:25:18 EST 2006 ajc
 * THIS IS 6.70
 
+Sat Jan 14 18:25:58 EST 2006 ajc
+* Config: Correct forged From: lines during authenticated SMTP
+
 Fri Jan 13 00:01:58 EST 2006 ajc
 * Removed the split bbview because it's b0rken in IE
 
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 5c3445dc5..1df22b0dd 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -290,8 +290,13 @@ void display_siteconfig(void)
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_smtp_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 25:
-			/* FIXME this is supposed to be c_rfc822_strict_from */
+		case 25:	/* note: reverse bool */
+			sprintf(&access[strlen(access)], "<TR><TD>");
+			sprintf(&access[strlen(access)], _("Correct forged From: lines during authenticated SMTP"));
+			sprintf(&access[strlen(access)], "</TD><TD>");
+			sprintf(&access[strlen(access)], "<input type=\"checkbox\" NAME=\"c_aide_zap\" VALUE=\"yes\" %s>",
+				((atoi(buf) == 0) ? "CHECKED" : ""));
+			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
 		case 26:
 			sprintf(&access[strlen(access)], "<TR><TD>");
@@ -600,7 +605,7 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_max_workers"));
 	serv_printf("%s", bstr("c_pop3_port"));
 	serv_printf("%s", bstr("c_smtp_port"));
-	serv_printf("");  /* FIXME this is supposed to be c_rfc822_strict_from */
+	serv_printf("%s", ((!strcasecmp(bstr("c_rfc822_strict_from"), "yes") ? "0" : "1"))); /* note: reverse bool */
 	serv_printf("%s", ((!strcasecmp(bstr("c_aide_zap"), "yes") ? "1" : "0")));
 	serv_printf("%s", bstr("c_imap_port"));
 	serv_printf("%s", bstr("c_net_freq"));
-- 
2.39.2