#include <stdarg.h>
#include <limits.h>
#include "citadel.h"
+#include "tools.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
-#include "config.h"
-
-/* #define DEBUG */ /* uncomment to get protocol traces */
+#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])) )
+ while ( (!IsEmptyStr(buf)) && (!isprint(buf[strlen(buf) - 1])) )
buf[strlen(buf) - 1] = 0;
}
*/
buf[i] = 0;
strip_trailing_nonprint(buf);
-#ifdef DEBUG
- printf("> %s\n", buf);
-#endif
+ if (debug) fprintf(stderr, "> %s\n", buf);
}
*/
void serv_puts(char *buf)
{
-#ifdef DEBUG
- printf("< %s\n", buf);
-#endif
+ if (debug) fprintf(stderr, "< %s\n", buf);
serv_write(buf, strlen(buf));
serv_write("\n", 1);
}
-
-
void cleanup(int exitcode) {
char buf[1024];
+ if (exitcode != 0) {
+ fprintf(stderr, "Error while sending mail. Please check your Citadel configuration.\n");
+ }
serv_puts("QUIT");
serv_gets(buf);
exit(exitcode);
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];
+ char **recipients = NULL;
+ int num_recipients = 0;
+ int to_or_cc = 0;
+ int read_recipients_from_headers = 0;
+ char *add_these_recipients = NULL;
- get_config();
+ for (i=1; i<argc; ++i) {
+ if (!strcmp(argv[i], "-d")) {
+ debug = 1;
+ }
+ else if (!strcmp(argv[i], "-t")) {
+ read_recipients_from_headers = 1;
+ }
+ 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);
pw = getpwuid(getuid());
fp = tmpfile();
if (fp == NULL) return(errno);
- snprintf(fromline, sizeof fromline, "From: %s@%s",
- pw->pw_name,
- config.c_fqdn
- );
+ serv_sock = uds_connectsock(file_lmtp_socket); /* FIXME: if called as 'sendmail' connect to file_lmtp_unfiltered_socket */
+ serv_gets(buf);
+ if (buf[0] != '2') {
+ if (debug) fprintf(stderr, "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);
+ }
+ sp ++;
+ ep = strchr (sp, ' ');
+ if (ep == NULL) cleanup(1);
+ *ep = '\0';
+ strncpy(hostname, sp, sizeof hostname);
+
+ snprintf(fromline, sizeof fromline, "From: %s@%s", pw->pw_name, hostname);
while (fgets(buf, 1024, stdin) != NULL) {
if ( ( (buf[0] == 13) || (buf[0] == 10)) && (in_body == 0) ) {
in_body = 1;
from_header = 1;
}
}
+
+ if (read_recipients_from_headers) {
+ add_these_recipients = NULL;
+ if ((isspace(buf[0])) && (to_or_cc)) {
+ add_these_recipients = buf;
+ }
+ else {
+ if ((!strncasecmp(buf, "To:", 3)) || (!strncasecmp(buf, "Cc:", 3))) {
+ to_or_cc = 1;
+ }
+ else {
+ to_or_cc = 0;
+ }
+ if (to_or_cc) {
+ add_these_recipients = &buf[3];
+ }
+ }
+
+ if (add_these_recipients) {
+ int num_recp_on_this_line;
+ char this_recp[256];
+
+ num_recp_on_this_line = num_tokens(add_these_recipients, ',');
+ for (i=0; i<num_recp_on_this_line; ++i) {
+ extract_token(this_recp, add_these_recipients,
+ i, ',', sizeof this_recp);
+ striplt(this_recp);
+ if (!IsEmptyStr(this_recp)) {
+ ++num_recipients;
+ recipients = realloc(recipients,
+ (num_recipients * sizeof (char *)));
+ recipients[num_recipients - 1] = strdup(this_recp);
+ }
+ }
+ }
+ }
+
fprintf(fp, "%s", buf);
}
strip_trailing_nonprint(fromline);
- serv_sock = uds_connectsock("lmtp.socket");
- serv_gets(buf);
- if (buf[0]!='2') cleanup(1);
-
- serv_puts("LHLO x");
+ sprintf(buf, "LHLO %s", hostname);
+ serv_puts(buf);
do {
serv_gets(buf);
strcat(buf, " ");
snprintf(buf, sizeof buf, "MAIL %s", fromline);
serv_puts(buf);
serv_gets(buf);
- if (buf[0]!='2') cleanup(1);
+ 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); */
- }
+ for (i=0; i<num_recipients; ++i) {
+ snprintf(buf, sizeof buf, "RCPT To: %s", recipients[i]);
+ serv_puts(buf);
+ serv_gets(buf);
+ free(recipients[i]);
}
+ free(recipients);
serv_puts("DATA");
serv_gets(buf);
}
serv_puts(".");
serv_gets(buf);
- if (buf[0]!='2') cleanup(1);
- else cleanup(0);
+ if (buf[0] != '2') {
+ cleanup(1);
+ }
+ else {
+ 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.
+ */
return(0);
}