X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fcitmail.c;h=777edb701f662e3999765ed87fa92e6022ae5b68;hb=736906e1b8fb937c5aa0e2311b80473304fa407a;hp=a7a4c9006e69b6d083f673b929437ed8616aa090;hpb=b55730dc4ec7638231d6f56f2f53b178f1ba2c96;p=citadel.git

diff --git a/citadel/utils/citmail.c b/citadel/utils/citmail.c
index a7a4c9006..777edb701 100644
--- a/citadel/utils/citmail.c
+++ b/citadel/utils/citmail.c
@@ -3,15 +3,15 @@
  * 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-2012 by the citadel.org team
+ * Copyright (c) 1987-2021 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"
@@ -31,9 +31,6 @@
 #include <limits.h>
 #include <libcitadel.h>
 #include "citadel.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
 #include "citadel_dirs.h"
 
 int serv_sock;
@@ -179,9 +176,6 @@ int main(int argc, char **argv) {
 	struct passwd *pw;
 	int from_header = 0;
 	int in_body = 0;
-	int relh=0;
-	int home=0;
-	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
 	char *sp, *ep;
 	char hostname[256];
@@ -198,21 +192,26 @@ int main(int argc, char **argv) {
 		else if (!strcmp(argv[i], "-t")) {
 			read_recipients_from_headers = 1;
 		}
+		else if (!strncmp(argv[i], "-h", 2)) {
+			safestrncpy(ctdldir, &argv[i][2], sizeof ctdldir);
+		}
 		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, 0);
 
+	if (chdir(ctdldir) != 0) {
+		fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno));
+		exit(errno);
+	}
+	       
 	pw = getpwuid(getuid());
 
 	fp = tmpfile();
 	if (fp == NULL) return(errno);
-	serv_sock = uds_connectsock(file_lmtp_socket);	/* FIXME: if called as 'sendmail' connect to file_lmtp_unfiltered_socket */
+	serv_sock = uds_connectsock(file_lmtp_socket);
 	serv_gets(buf);
 	if (buf[0] != '2') {
 		fprintf(stderr, "%s\n", &buf[4]);
@@ -231,7 +230,9 @@ int main(int argc, char **argv) {
 		if (debug) fprintf(stderr, "citmail: error parsing hostname\n");
 		cleanup(3);
 	}
-	*ep = '\0';
+	else
+		*ep = '\0';
+
 	strncpy(hostname, sp, sizeof hostname);
 
 	snprintf(fromline, sizeof fromline, "From: %s@%s", pw->pw_name, hostname);