updated config.guess in libcitadel

[citadel.git] / citadel / citmail.c

diff --git a/citadel/citmail.c b/citadel/citmail.c
index 5241407343bc3cb5167a917b5da323353b5ce449..777edb701f662e3999765ed87fa92e6022ae5b68 100644 (file)
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -1,10 +1,17 @@
 /*
- * $Id$
- *
  * This program attempts to act like a local MDA if you're using sendmail or
  * 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-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 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"
@@ -22,11 +29,8 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
-#include "tools.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
 #include "citadel_dirs.h"
 
 int serv_sock;
@@ -56,13 +60,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);
@@ -154,7 +158,7 @@ void cleanup(int exitcode) {
        char buf[1024];
 
        if (exitcode != 0) {
-               fprintf(stderr, "Error #%d occurred while sending mail.\n", exitcode);
+               fprintf(stderr, "citmail: error #%d occurred while sending mail.\n", exitcode);
                fprintf(stderr, "Please check your Citadel configuration.\n");
        }
        serv_puts("QUIT");
@@ -172,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];
@@ -184,8 +185,6 @@ int main(int argc, char **argv) {
        int read_recipients_from_headers = 0;
        char *add_these_recipients = NULL;
 
-       CtdlInitBase64Table();
-
        for (i=1; i<argc; ++i) {
                if (!strcmp(argv[i], "-d")) {
                        debug = 1;
@@ -193,37 +192,47 @@ 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]);
-               if (debug) fprintf(stderr, "Could not connect to LMTP socket.\n");
+               if (debug) fprintf(stderr, "citmail: could not connect to LMTP socket.\n");
                cleanup(1);
        }
 
        sp = strchr (buf, ' ');
        if (sp == NULL) {
-               if (debug) fprintf(stderr, "Could not calculate hostname.\n");
+               if (debug) fprintf(stderr, "citmail: could not calculate hostname.\n");
                cleanup(2);
        }
        sp ++;
        ep = strchr (sp, ' ');
-       if (ep == NULL) cleanup(3);
-       *ep = '\0';
+       if (ep == NULL) {
+               if (debug) fprintf(stderr, "citmail: error parsing hostname\n");
+               cleanup(3);
+       }
+       else
+               *ep = '\0';
+
        strncpy(hostname, sp, sizeof hostname);
 
        snprintf(fromline, sizeof fromline, "From: %s@%s", pw->pw_name, hostname);
@@ -234,11 +243,9 @@ 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) {
@@ -287,12 +294,18 @@ int main(int argc, char **argv) {
                serv_gets(buf);
                strcat(buf, "    ");
        } while (buf[3] == '-');
-       if (buf[0] != '2') cleanup(4);
+       if (buf[0] != '2') {
+               if (debug) fprintf(stderr, "citmail: LHLO command failed\n");
+               cleanup(4);
+       }
 
        snprintf(buf, sizeof buf, "MAIL %s", fromline);
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0] != '2') cleanup(5);
+       if (buf[0] != '2') {
+               if (debug) fprintf(stderr, "citmail: MAIL command failed\n");
+               cleanup(5);
+       }
 
        for (i=0; i<num_recipients; ++i) {
                snprintf(buf, sizeof buf, "RCPT To: %s", recipients[i]);
@@ -304,7 +317,10 @@ int main(int argc, char **argv) {
 
        serv_puts("DATA");
        serv_gets(buf);
-       if (buf[0]!='3') cleanup(6);
+       if (buf[0]!='3') {
+               if (debug) fprintf(stderr, "citmail: DATA command failed\n");
+               cleanup(6);
+       }
 
        rewind(fp);
        while (fgets(buf, sizeof buf, fp) != NULL) {