/*
- *
- * Completely reworked version of "citmail"
- * This program attempts to act like a local MDA if you're using sendmail or
- * some other non-Citadel MTA. It basically just forwards the message to
- * the Citadel SMTP listener on some non-standard port.
- *
* $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.
+ *
*/
#include "sysdep.h"
#include <pwd.h>
#include <errno.h>
#include <stdarg.h>
+#include <limits.h>
#include "citadel.h"
-#include "citadel_decls.h"
-#include "ipc.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
+#include "config.h"
/* #define DEBUG */ /* uncomment to get protocol traces */
int uds_connectsock(char *sockpath)
{
int s;
- struct sockaddr_un sun;
+ struct sockaddr_un addr;
- memset(&sun, 0, sizeof(sun));
- sun.sun_family = AF_UNIX;
- strncpy(sun.sun_path, sockpath, sizeof sun.sun_path);
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX;
+ strncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
exit(3);
}
- if (connect(s, (struct sockaddr *) &sun, sizeof(sun)) < 0) {
+ if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
fprintf(stderr, "can't connect: %s\n",
strerror(errno));
+ close(s);
exit(3);
}
*/
for (i = 0;; i++) {
serv_read(&buf[i], 1);
- if (buf[i] == '\n' || i == 255)
+ if (buf[i] == '\n' || i == (SIZ-1))
break;
}
/* If we got a long line, discard characters until the newline.
*/
- if (i == 255)
+ if (i == (SIZ-1))
while (buf[i] != '\n')
serv_read(&buf[i], 1);
char buf[1024];
char fromline[1024];
FILE *fp;
+ int i;
+ struct passwd *pw;
+ int from_header = 0;
+ int in_body = 0;
+
+ get_config();
+
+ pw = getpwuid(getuid());
fp = tmpfile();
if (fp == NULL) return(errno);
- sprintf(fromline, "From: someone@somewhere.org");
+ snprintf(fromline, sizeof fromline, "From: %s@%s",
+ pw->pw_name,
+ config.c_fqdn
+ );
while (fgets(buf, 1024, stdin) != NULL) {
+ if ( ( (buf[0] == 13) || (buf[0] == 10)) && (in_body == 0) ) {
+ in_body = 1;
+ if (from_header == 0) {
+ fprintf(fp, "%s%s", fromline, buf);
+ }
+ }
+ if (!strncasecmp(buf, "From:", 5)) {
+ strcpy(fromline, buf);
+ if (in_body == 0) {
+ from_header = 1;
+ }
+ }
fprintf(fp, "%s", buf);
- if (!strncasecmp(buf, "From:", 5)) strcpy(fromline, buf);
}
strip_trailing_nonprint(fromline);
- serv_sock = uds_connectsock("smtp.socket");
+ serv_sock = uds_connectsock(
+#ifndef HAVE_RUN_DIR
+ "."
+#else
+ RUN_DIR
+#endif
+ "/lmtp.socket");
serv_gets(buf);
if (buf[0]!='2') cleanup(1);
- serv_puts("HELO localhost");
- serv_gets(buf);
- if (buf[0]!='2') cleanup(1);
+ serv_puts("LHLO x");
+ do {
+ serv_gets(buf);
+ strcat(buf, " ");
+ } while (buf[3] == '-');
+ if (buf[0] != '2') cleanup(1);
- sprintf(buf, "MAIL %s", fromline);
+ snprintf(buf, sizeof buf, "MAIL %s", fromline);
serv_puts(buf);
serv_gets(buf);
if (buf[0]!='2') cleanup(1);
- sprintf(buf, "RCPT To: %s", argv[1]);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0]!='2') cleanup(1);
+ for (i=1; i<argc; ++i) {
+ if (argv[i][0] != '-') {
+ snprintf(buf, sizeof buf, "RCPT To: %s", argv[i]);
+ serv_puts(buf);
+ serv_gets(buf);
+ /* if (buf[0]!='2') cleanup(1); */
+ }
+ }
serv_puts("DATA");
serv_gets(buf);