X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;fp=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=d6a8fb6142b75472545189ca79da166a712acae7;hp=297dad260c3c4045d395867cee607456ceef71f3;hb=adccf08ddebcb920c4244cc62bc48f85575c2d88;hpb=21ab241ce134dfd2dd1520249e569d4b71c6e6e2

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 297dad260..d6a8fb614 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -444,7 +444,7 @@ void smtp_try_plain(long offset, long Flags)
 
 	if (result == login_ok) {
 		if (CtdlTryPassword(pass, len) == pass_ok) {
-			smtp_webcit_preferences_hack();
+////			smtp_webcit_preferences_hack();
 			smtp_auth_greeting(offset, Flags);
 			return;
 		}
@@ -516,8 +516,6 @@ void smtp_auth(long offset, long Flags)
  * Set do_response to nonzero to output the SMTP RSET response code.
  */
 void smtp_rset(long offset, long do_response) {
-	int is_lmtp;
-	int is_unfiltered;
 	citsmtp *sSMTP = SMTP;
 
 	/*
@@ -525,10 +523,21 @@ void smtp_rset(long offset, long do_response) {
 	 * but we need to preserve this one little piece of information, so
 	 * we save it for later.
 	 */
-	is_lmtp = sSMTP->is_lmtp;
-	is_unfiltered = sSMTP->is_unfiltered;
 
-	memset(sSMTP, 0, sizeof(citsmtp));
+	FlushStrBuf(sSMTP->Cmd);
+	FlushStrBuf(sSMTP->helo_node);
+	FlushStrBuf(sSMTP->from);
+	FlushStrBuf(sSMTP->recipients);
+	FlushStrBuf(sSMTP->OneRcpt);
+
+	sSMTP->command_state = 0;
+	sSMTP->number_of_recipients = 0;
+	sSMTP->delivery_mode = 0;
+	sSMTP->message_originated_locally = 0;
+	sSMTP->is_msa = 0;
+	/*
+	 * we must remember is_lmtp & is_unfiltered.
+	 */
 
 	/*
 	 * It is somewhat ambiguous whether we want to log out when a RSET
@@ -541,12 +550,6 @@ void smtp_rset(long offset, long do_response) {
 	 * }
 	 */
 
-	/*
-	 * Reinstate this little piece of information we saved (see above).
-	 */
-	sSMTP->is_lmtp = is_lmtp;
-	sSMTP->is_unfiltered = is_unfiltered;
-
 	if (do_response) {
 		cprintf("250 Zap!\r\n");
 	}