/*
- *
- * 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 <signal.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <sys/un.h>
#include <netdb.h>
#include <string.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"
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
+/* #define DEBUG */ /* uncomment to get protocol traces */
int serv_sock;
}
-
-
-
-
void timeout(int signum)
{
exit(signum);
}
-int connectsock(char *host, char *service, char *protocol)
+int uds_connectsock(char *sockpath)
{
- struct hostent *phe;
- struct servent *pse;
- struct protoent *ppe;
- struct sockaddr_in sin;
- int s, type;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
-
- pse = getservbyname(service, protocol);
- if (pse) {
- sin.sin_port = pse->s_port;
- } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
- fprintf(stderr, "Can't get %s service entry: %s\n",
- service, strerror(errno));
- exit(3);
- }
- phe = gethostbyname(host);
- if (phe) {
- memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
- } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
- fprintf(stderr, "Can't get %s host entry: %s\n",
- host, strerror(errno));
- exit(3);
- }
- if ((ppe = getprotobyname(protocol)) == 0) {
- fprintf(stderr, "Can't get %s protocol entry: %s\n",
- protocol, strerror(errno));
- exit(3);
- }
- if (!strcmp(protocol, "udp")) {
- type = SOCK_DGRAM;
- } else {
- type = SOCK_STREAM;
- }
+ 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);
- s = socket(PF_INET, type, ppe->p_proto);
+ s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- fprintf(stderr, "Can't create socket: %s\n", strerror(errno));
+ fprintf(stderr, "Can't create socket: %s\n",
+ strerror(errno));
exit(3);
}
- signal(SIGALRM, timeout);
- alarm(30);
- if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
- fprintf(stderr, "can't connect to %s.%s: %s\n",
- host, service, strerror(errno));
+ if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ fprintf(stderr, "can't connect: %s\n",
+ strerror(errno));
+ close(s);
exit(3);
}
- alarm(0);
- signal(SIGALRM, SIG_IGN);
- return (s);
+ return s;
}
-/*
- * convert service and host entries into a six-byte numeric in the format
- * expected by a SOCKS v4 server
- */
-void numericize(char *buf, char *host, char *service, char *protocol)
-{
- struct hostent *phe;
- struct servent *pse;
- struct sockaddr_in sin;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
-
- pse = getservbyname(service, protocol);
- if (pse) {
- sin.sin_port = pse->s_port;
- } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
- fprintf(stderr, "Can't get %s service entry: %s\n",
- service, strerror(errno));
- exit(3);
- }
- buf[1] = (((sin.sin_port) & 0xFF00) >> 8);
- buf[0] = ((sin.sin_port) & 0x00FF);
-
- phe = gethostbyname(host);
- if (phe) {
- memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
- } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
- fprintf(stderr, "Can't get %s host entry: %s\n",
- host, strerror(errno));
- exit(3);
- }
- buf[5] = ((sin.sin_addr.s_addr) & 0xFF000000) >> 24;
- buf[4] = ((sin.sin_addr.s_addr) & 0x00FF0000) >> 16;
- buf[3] = ((sin.sin_addr.s_addr) & 0x0000FF00) >> 8;
- buf[2] = ((sin.sin_addr.s_addr) & 0x000000FF);
-}
/*
* input binary data from socket
*/
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);
*/
buf[i] = 0;
strip_trailing_nonprint(buf);
+#ifdef DEBUG
+ printf("> %s\n", buf);
+#endif
}
*/
void serv_puts(char *buf)
{
- /* printf("< %s\n", buf); */
+#ifdef DEBUG
+ printf("< %s\n", buf);
+#endif
serv_write(buf, strlen(buf));
serv_write("\n", 1);
}
serv_puts("QUIT");
serv_gets(buf);
- fprintf(stderr, "%s\n", buf);
exit(exitcode);
}
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);
- sprintf(buf, "%d", SMTP_PORT);
- serv_sock = connectsock("localhost", buf, "tcp");
+ serv_sock = uds_connectsock(
+#ifndef HAVE_RUN_DIR
+ "."
+#else
+ RUN_DIR
+#endif
+ "/lmtp.socket");
serv_gets(buf);
- fprintf(stderr, "%s\n", buf);
if (buf[0]!='2') cleanup(1);
- serv_puts("HELO localhost");
- serv_gets(buf);
- fprintf(stderr, "%s\n", 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);
- fprintf(stderr, "%s\n", buf);
if (buf[0]!='2') cleanup(1);
- sprintf(buf, "RCPT To: %s", argv[1]);
- serv_puts(buf);
- serv_gets(buf);
- fprintf(stderr, "%s\n", 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);
- fprintf(stderr, "%s\n", buf);
if (buf[0]!='3') cleanup(1);
rewind(fp);
}
serv_puts(".");
serv_gets(buf);
- fprintf(stderr, "%s\n", buf);
if (buf[0]!='2') cleanup(1);
else cleanup(0);
return(0);