From: Wilfried Goesgens <dothebart@citadel.org>
Date: Fri, 22 Feb 2013 11:41:15 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.20~92
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=ff7f36e7a7ad88d75d1201a78cb60dc6b2cce299;hp=7389885c5aa497ec0f3332a5a04f305a4e56ed06;p=citadel.git

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index cf8f6eb74..49169b6f3 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -303,6 +303,23 @@ void smtp_hello(long offset, long which_command)
 }
 
 
+/*
+ * The configuration item for the user's preferred display name for outgoing email is, unfortunately,
+ * stored in the account's WebCit configuration.  We have to fetch it now.
+void smtp_webcit_preferences_hack(void) {
+	char config_roomname[ROOMNAMELEN];
+
+	snprintf(config_roomname, sizeof config_roomname, "%010ld.%s", CC->user.usernum, USERCONFIGROOM);
+	if (CtdlGetRoom(&CC->room, config_roomname) != 0) {
+		return;
+	}
+
+	// FIXME ... finish this
+
+}
+ */
+
+
 
 /*
  * Implement HELP command.
@@ -388,6 +405,7 @@ void smtp_try_plain(long offset, long Flags)
 
 	if (result == login_ok) {
 		if (CtdlTryPassword(pass, len) == pass_ok) {
+			/* smtp_webcit_preferences_hack(); */
 			smtp_auth_greeting(offset, Flags);
 			return;
 		}