From: Art Cancro <ajc@citadel.org>
Date: Thu, 12 May 2005 16:53:18 +0000 (+0000)
Subject: * Fixed a minor bug discovered in SMTP at one site
X-Git-Tag: v7.86~4923
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=00b32afcf3e846485669fb835b752023ae3a9ac2;p=citadel.git

* Fixed a minor bug discovered in SMTP at one site
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 27befd4d5..086df5713 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 646.1  2005/05/12 16:53:18  ajc
+ * Fixed a minor bug discovered in SMTP at one site
+
  Revision 646.0  2005/05/11 17:06:04  ajc
  * THIS IS 6.46
 
@@ -6673,4 +6676,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
 	* Initial CVS import
-
diff --git a/citadel/citadel.h b/citadel/citadel.h
index c5e5fb4f9..4fdbc12b1 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -33,7 +33,7 @@ extern "C" {
 /*
  * Text description of this software
  */
-#define CITADEL	"Citadel 6.46"
+#define CITADEL	"Citadel 6.47"
 
 /*
  * REV_LEVEL is the current version number (multiplied by 100 to avoid having
@@ -45,7 +45,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL	646		/* This version */
+#define REV_LEVEL	647		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
 #define EXPORT_REV_MIN	626		/* Oldest compatible export files */
 
diff --git a/citadel/citadel.lsm b/citadel/citadel.lsm
index 17f986cf6..5f9de9775 100644
--- a/citadel/citadel.lsm
+++ b/citadel/citadel.lsm
@@ -1,7 +1,7 @@
 Begin4
 Title: Citadel
-Version: 6.46
-Entered-date: Sat May  7 23:42:09 EDT 2005
+Version: 6.47
+Entered-date: Thu May 12 12:52:30 EDT 2005
 Description: The Citadel messaging platform for Unix systems.
         In addition to BBS functionality, Citadel also offers advanced
 	messaging and groupware applications, including Internet e-mail
diff --git a/citadel/citadel.nsi b/citadel/citadel.nsi
index 74927e5c5..d0ac1df38 100644
--- a/citadel/citadel.nsi
+++ b/citadel/citadel.nsi
@@ -4,7 +4,7 @@
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 !define MUI_PRODUCT "Citadel"
-!define MUI_VERSION "6.46"
+!define MUI_VERSION "6.47"
 !define MUI_WELCOMEPAGE
 !define MUI_LICENSEPAGE
 !define MUI_COMPONENTSPAGE
diff --git a/citadel/citadel.spec b/citadel/citadel.spec
index 08152d5d8..32978d79a 100644
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -1,7 +1,7 @@
 # $Id$
 Summary: Citadel, the flexible, powerful way to build online communities
 Name: citadel
-Version: 6.46
+Version: 6.47
 Release: 1
 Copyright: GPL
 Group: Applications/Communications
diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 2990b340a..77043a913 100644
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -973,6 +973,7 @@ void smtp_try(const char *key, const char *addr, int *status,
 		}
 	} while (scan_done == 0);
 	if (strlen(mailfrom)==0) strcpy(mailfrom, "someone@somewhere.org");
+	stripallbut(mailfrom, '<', '>');
 
 	/* Figure out what mail exchanger host we have to connect to */
 	num_mxhosts = getmx(mxhosts, node);