* Applied a patch sent in by Wilfried Goesgens which allows the various

[citadel.git] / citadel / citmail.c

diff --git a/citadel/citmail.c b/citadel/citmail.c
index d657e9e88cf55ab66e90d17997d76c146f52e132..69af5958f036a5b79aba20bd4bd608b43f84fa09 100644 (file)
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -171,19 +171,45 @@ int main(int argc, char **argv) {
        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);
-       snprintf(fromline, sizeof 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("lmtp.socket");
+       serv_sock = uds_connectsock(
+#ifndef HAVE_RUN_DIR
+                                                  "."
+#else
+                                                  RUN_DIR
+#endif
+                                                  "/lmtp.socket");
        serv_gets(buf);
        if (buf[0]!='2') cleanup(1);
 
@@ -199,10 +225,14 @@ int main(int argc, char **argv) {
        serv_gets(buf);
        if (buf[0]!='2') cleanup(1);
 
-       snprintf(buf, sizeof 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);