X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpqueue.c;fp=citadel%2Fmodules%2Fsmtp%2Fserv_smtpqueue.c;h=df04bdcc5f713f66ebdb138c9d2bc73ab1067458;hb=4db4fc48793f3680c5defd28ea32c97044a2b569;hp=a38dbe74262bf71c9ae7c3b3b42ca4aa9e46af74;hpb=15054b0f11409cfc68102560fe4ab5a4e2bf4ea0;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index a38dbe742..df04bdcc5 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -20,15 +20,21 @@
  * The VRFY and EXPN commands have been removed from this implementation
  * because nobody uses these commands anymore, except for spammers.
  *
- * Copyright (c) 1998-2015 by the citadel.org team
+ * Copyright (c) 1998-2012 by the citadel.org team
  *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *  
+ *  
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *  
+ *  
+ *  
  */
 
 #include "sysdep.h"
@@ -600,7 +606,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt, ParsedURL *Relay)
 	boundary = NewStrBufPlain(HKEY("=_Citadel_Multipart_"));
 	StrBufAppendPrintf(boundary,
 			   "%s_%04x%04x",
-			   CtdlGetConfigStr("c_fqdn"),
+			   config.c_fqdn,
 			   getpid(),
 			   ++seq);
 
@@ -697,7 +703,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt, ParsedURL *Relay)
 
 	CM_SetField(bmsg, eOriginalRoom, HKEY(MAILROOM));
 	CM_SetField(bmsg, eAuthor, HKEY("Citadel"));
-	CM_SetField(bmsg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+	CM_SetField(bmsg, eNodeName, CFG_KEY(c_nodename));
 	CM_SetField(bmsg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
 	CM_SetAsFieldSB(bmsg, eMesageText, &BounceMB);
 
@@ -719,7 +725,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt, ParsedURL *Relay)
 
 	/* If not, post it in the Aide> room */
 	if (successful_bounce == 0) {
-		CtdlSubmitMsg(bmsg, NULL, CtdlGetConfigStr("c_aideroom"), QP_EADDR);
+		CtdlSubmitMsg(bmsg, NULL, config.c_aideroom, QP_EADDR);
 	}
 
 	/* Free up the memory we used */