-/*
- * 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
- */
-
-#include "sysdep.h"
+// This program attempts to act like a local MDA if you're using postfix 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-2022 by the citadel.org team
+//
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
+
#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
#include <stdarg.h>
#include <limits.h>
#include <libcitadel.h>
-#include "citadel.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-#include "citadel_dirs.h"
+#include "../server/sysdep.h"
+#include "../server/citadel.h"
+#include "../server/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) {
}
-/*
- * input binary data from socket
- */
-void serv_read(char *buf, int bytes)
-{
+// input binary data from socket
+void serv_read(char *buf, int bytes) {
int len, rlen;
len = 0;
}
-/*
- * send binary to server
- */
-void serv_write(char *buf, int nbytes)
-{
+// send binary to server
+void serv_write(char *buf, int nbytes) {
int bytes_written = 0;
int retval;
while (bytes_written < nbytes) {
}
-
-/*
- * input string from socket - implemented in terms of serv_read()
- */
-void serv_gets(char *buf)
-{
+// input string from socket - implemented in terms of serv_read()
+void serv_gets(char *buf) {
int i;
- /* Read one character at a time.
- */
+ // Read one character at a time.
for (i = 0;; i++) {
serv_read(&buf[i], 1);
if (buf[i] == '\n' || i == (SIZ-1))
break;
}
- /* If we got a long line, discard characters until the newline.
- */
+ // If we got a long line, discard characters until the newline.
if (i == (SIZ-1))
while (buf[i] != '\n')
serv_read(&buf[i], 1);
- /* Strip all trailing nonprintables (crlf)
- */
+ // Strip all trailing nonprintables (crlf)
buf[i] = 0;
strip_trailing_nonprint(buf);
if (debug) fprintf(stderr, "> %s\n", buf);
}
-/*
- * send line to server - implemented in terms of serv_write()
- */
-void serv_puts(char *buf)
-{
+// send line to server - implemented in terms of serv_write()
+void serv_puts(char *buf) {
if (debug) fprintf(stderr, "< %s\n", buf);
serv_write(buf, strlen(buf));
serv_write("\n", 1);
}
-
void cleanup(int exitcode) {
char buf[1024];
}
-
int main(int argc, char **argv) {
char buf[1024];
char fromline[1024];
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];
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, "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);
for (i=0; i<num_recp_on_this_line; ++i) {
extract_token(this_recp, add_these_recipients,
i, ',', sizeof this_recp);
- striplt(this_recp);
+ string_trim(this_recp);
if (!IsEmptyStr(this_recp)) {
++num_recipients;
recipients = realloc(recipients,
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.
- */
+ // 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);
}
projects / citadel.git / blobdiff