X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitmail.c;h=2f1bdc2a12ad78f3dd6bf7d5e2314ae63c624e40;hb=4eb74b26380dfde31c86c685f0589e0c653aebf0;hp=09b6c93479614b39e9b52826819d257713cc7ebf;hpb=1248e88ae490d17b4896ada5a74a0a9ea23b365c;p=citadel.git

diff --git a/citadel/citmail.c b/citadel/citmail.c
index 09b6c9347..2f1bdc2a1 100644
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -5,6 +5,21 @@
  * some other non-Citadel MTA.  It basically just contacts the Citadel LMTP
  * listener on a unix domain socket and transmits the message.
  *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -22,21 +37,19 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
-#include "config.h"
 #include "citadel_dirs.h"
 
-/* #define DEBUG  */	/* uncomment to get protocol traces */
-
 int serv_sock;
-
+int debug = 0;
 
 void strip_trailing_nonprint(char *buf)
 {
-        while ( (strlen(buf)>0) && (!isprint(buf[strlen(buf) - 1])) )
+        while ( (!IsEmptyStr(buf)) && (!isprint(buf[strlen(buf) - 1])) )
                 buf[strlen(buf) - 1] = 0;
 }
 
@@ -58,13 +71,13 @@ int uds_connectsock(char *sockpath)
 
 	s = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (s < 0) {
-		fprintf(stderr, "Can't create socket: %s\n",
+		fprintf(stderr, "citmail: Can't create socket: %s\n",
 			strerror(errno));
 		exit(3);
 	}
 
 	if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-		fprintf(stderr, "can't connect: %s\n",
+		fprintf(stderr, "citmail: can't connect: %s\n",
 			strerror(errno));
 		close(s);
 		exit(3);
@@ -136,9 +149,7 @@ void serv_gets(char *buf)
 	 */
 	buf[i] = 0;
 	strip_trailing_nonprint(buf);
-#ifdef DEBUG
-	printf("> %s\n", buf);
-#endif
+	if (debug) fprintf(stderr, "> %s\n", buf);
 }
 
 
@@ -147,20 +158,20 @@ void serv_gets(char *buf)
  */
 void serv_puts(char *buf)
 {
-#ifdef DEBUG
-	printf("< %s\n", buf);
-#endif
+	if (debug) fprintf(stderr, "< %s\n", buf);
 	serv_write(buf, strlen(buf));
 	serv_write("\n", 1);
 }
 
 
 
-
-
 void cleanup(int exitcode) {
 	char buf[1024];
 
+	if (exitcode != 0) {
+		fprintf(stderr, "citmail: error #%d occurred while sending mail.\n", exitcode);
+		fprintf(stderr, "Please check your Citadel configuration.\n");
+	}
 	serv_puts("QUIT");
 	serv_gets(buf);
 	exit(exitcode);
@@ -180,20 +191,55 @@ int main(int argc, char **argv) {
 	int home=0;
 	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
+	char *sp, *ep;
+	char hostname[256];
+	char **recipients = NULL;
+	int num_recipients = 0;
+	int to_or_cc = 0;
+	int read_recipients_from_headers = 0;
+	char *add_these_recipients = NULL;
 
+	for (i=1; i<argc; ++i) {
+		if (!strcmp(argv[i], "-d")) {
+			debug = 1;
+		}
+		else if (!strcmp(argv[i], "-t")) {
+			read_recipients_from_headers = 1;
+		}
+		else if (argv[i][0] != '-') {
+			++num_recipients;
+			recipients = realloc(recipients, (num_recipients * sizeof (char *)));
+			recipients[num_recipients - 1] = strdup(argv[i]);
+		}
+	}
+	       
 	/* TODO: should we be able to calculate relative dirs? */
-	calc_dirs_n_files(relh, home, relhome, ctdldir);
-
-	get_config();
+	calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
 	pw = getpwuid(getuid());
 
 	fp = tmpfile();
 	if (fp == NULL) return(errno);
-	snprintf(fromline, sizeof fromline, "From: %s@%s",
-		pw->pw_name,
-		config.c_fqdn
-	);
+	serv_sock = uds_connectsock(file_lmtp_socket);	/* FIXME: if called as 'sendmail' connect to file_lmtp_unfiltered_socket */
+	serv_gets(buf);
+	if (buf[0] != '2') {
+		fprintf(stderr, "%s\n", &buf[4]);
+		if (debug) fprintf(stderr, "citmail: could not connect to LMTP socket.\n");
+		cleanup(1);
+	}
+
+	sp = strchr (buf, ' ');
+	if (sp == NULL) {
+		if (debug) fprintf(stderr, "citmail: ould not calculate hostname.\n");
+		cleanup(2);
+	}
+	sp ++;
+	ep = strchr (sp, ' ');
+	if (ep == NULL) cleanup(3);
+	*ep = '\0';
+	strncpy(hostname, sp, sizeof hostname);
+
+	snprintf(fromline, sizeof fromline, "From: %s@%s", pw->pw_name, hostname);
 	while (fgets(buf, 1024, stdin) != NULL) {
 		if ( ( (buf[0] == 13) || (buf[0] == 10)) && (in_body == 0) ) {
 			in_body = 1;
@@ -201,44 +247,75 @@ int main(int argc, char **argv) {
 				fprintf(fp, "%s%s", fromline, buf);
 			}
 		}
-		if (!strncasecmp(buf, "From:", 5)) {
+		if (in_body == 0 && !strncasecmp(buf, "From:", 5)) {
 			strcpy(fromline, buf);
-			if (in_body == 0) {
-				from_header = 1;
+			from_header = 1;
+		}
+
+		if (read_recipients_from_headers) {
+			add_these_recipients = NULL;
+			if ((isspace(buf[0])) && (to_or_cc)) {
+				add_these_recipients = buf;
+			}
+			else {
+				if ((!strncasecmp(buf, "To:", 3)) || (!strncasecmp(buf, "Cc:", 3))) {
+					to_or_cc = 1;
+				}
+				else {
+					to_or_cc = 0;
+				}
+				if (to_or_cc) {
+					add_these_recipients = &buf[3];
+				}
+			}
+
+			if (add_these_recipients) {
+				int num_recp_on_this_line;
+				char this_recp[256];
+
+				num_recp_on_this_line = num_tokens(add_these_recipients, ',');
+				for (i=0; i<num_recp_on_this_line; ++i) {
+					extract_token(this_recp, add_these_recipients,
+						i, ',', sizeof this_recp);
+					striplt(this_recp);
+					if (!IsEmptyStr(this_recp)) {
+						++num_recipients;
+						recipients = realloc(recipients,
+							(num_recipients * sizeof (char *)));
+						recipients[num_recipients - 1] = strdup(this_recp);
+					}
+				}
 			}
 		}
+
 		fprintf(fp, "%s", buf);
 	}
 	strip_trailing_nonprint(fromline);
 
-	serv_sock = uds_connectsock(file_lmtp_socket);
-	serv_gets(buf);
-	if (buf[0]!='2') cleanup(1);
-
-	serv_puts("LHLO x");
+	sprintf(buf, "LHLO %s", hostname);
+	serv_puts(buf);
 	do {
 		serv_gets(buf);
 		strcat(buf, "    ");
 	} while (buf[3] == '-');
-	if (buf[0] != '2') cleanup(1);
+	if (buf[0] != '2') cleanup(4);
 
 	snprintf(buf, sizeof buf, "MAIL %s", fromline);
 	serv_puts(buf);
 	serv_gets(buf);
-	if (buf[0]!='2') cleanup(1);
+	if (buf[0] != '2') cleanup(5);
 
-	for (i=1; i<argc; ++i) {
-		if (argv[i][0] != '-') {
-			snprintf(buf, sizeof buf, "RCPT To: %s", argv[i]);
-			serv_puts(buf);
-			serv_gets(buf);
-			/* if (buf[0]!='2') cleanup(1); */
-		}
+	for (i=0; i<num_recipients; ++i) {
+		snprintf(buf, sizeof buf, "RCPT To: %s", recipients[i]);
+		serv_puts(buf);
+		serv_gets(buf);
+		free(recipients[i]);
 	}
+	free(recipients);
 
 	serv_puts("DATA");
 	serv_gets(buf);
-	if (buf[0]!='3') cleanup(1);
+	if (buf[0]!='3') cleanup(6);
 
 	rewind(fp);
 	while (fgets(buf, sizeof buf, fp) != NULL) {
@@ -247,7 +324,17 @@ int main(int argc, char **argv) {
 	}
 	serv_puts(".");
 	serv_gets(buf);
-	if (buf[0]!='2') cleanup(1);
-	else cleanup(0);
+	if (buf[0] != '2') {
+		fprintf(stderr, "%s\n", &buf[4]);
+		cleanup(7);
+	}
+	else {
+		cleanup(0);
+	}
+
+	/* We won't actually reach this statement but the compiler will
+	 * display a spurious warning about an invalid return type if
+	 * we don't return an int.
+	 */
 	return(0);
 }