X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitmail.c;h=f1c6ae8c780b1e85708f8a378520dae8d1328151;hb=5b4f25945be356aa3a8797e70bbe16355538a967;hp=2f1bdc2a12ad78f3dd6bf7d5e2314ae63c624e40;hpb=4eb74b26380dfde31c86c685f0589e0c653aebf0;p=citadel.git diff --git a/citadel/citmail.c b/citadel/citmail.c index 2f1bdc2a1..f1c6ae8c7 100644 --- a/citadel/citmail.c +++ b/citadel/citmail.c @@ -1,26 +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-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 - */ +// 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 @@ -39,35 +30,30 @@ #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 ( (!IsEmptyStr(buf)) && (!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) { @@ -187,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]; @@ -206,21 +189,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]); @@ -230,13 +218,18 @@ int main(int argc, char **argv) { sp = strchr (buf, ' '); if (sp == NULL) { - if (debug) fprintf(stderr, "citmail: ould 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); @@ -298,12 +291,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