X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitmail.c;h=f1c6ae8c780b1e85708f8a378520dae8d1328151;hb=5b4f25945be356aa3a8797e70bbe16355538a967;hp=63f75bd3d0702c06884e8e26f3ca04b5b0ba49ed;hpb=e1cccf27e5d8cad0720f5d39d806832fc184f367;p=citadel.git diff --git a/citadel/citmail.c b/citadel/citmail.c index 63f75bd3d..f1c6ae8c7 100644 --- a/citadel/citmail.c +++ b/citadel/citmail.c @@ -1,11 +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. - * - */ +// 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. Really though, +// if your MTA supports LMTP then you definitely should be using that instead. +// +// 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" #include @@ -22,46 +28,42 @@ #include #include #include +#include #include "citadel.h" -#ifndef HAVE_SNPRINTF -#include "snprintf.h" -#endif #include "citadel_dirs.h" int serv_sock; int debug = 0; -void strip_trailing_nonprint(char *buf) -{ - while ( (strlen(buf)>0) && (!isprint(buf[strlen(buf) - 1])) ) +void strip_trailing_nonprint(char *buf) { + while ( (!IsEmptyStr(buf)) && (!isprint(buf[strlen(buf) - 1])) ) { buf[strlen(buf) - 1] = 0; + } } -void timeout(int signum) -{ +void timeout(int signum) { exit(signum); } -int uds_connectsock(char *sockpath) -{ +int uds_connectsock(char *sockpath) { int s; struct sockaddr_un addr; memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, sockpath, sizeof addr.sun_path); + strcpy(addr.sun_path, 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); @@ -153,7 +155,8 @@ void cleanup(int exitcode) { char buf[1024]; if (exitcode != 0) { - fprintf(stderr, "Error while sending mail. Please check your Citadel configuration.\n"); + 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); @@ -170,9 +173,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]; @@ -189,36 +189,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); + 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') { - if (debug) fprintf(stderr, "Could not connect to LMTP socket.\n"); + 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, "Could not calculate hostname.\n"); - cleanup(1); + if (debug) fprintf(stderr, "citmail: could not calculate hostname.\n"); + cleanup(2); } sp ++; ep = strchr (sp, ' '); - if (ep == NULL) cleanup(1); - *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); @@ -229,11 +240,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) { @@ -254,7 +263,21 @@ int main(int argc, char **argv) { } if (add_these_recipients) { - /* FIXME do something with them */ + int num_recp_on_this_line; + char this_recp[256]; + + num_recp_on_this_line = num_tokens(add_these_recipients, ','); + for (i=0; i