Added Postfix pipe backend support (Niki Guldbrand)

diff --git a/ChangeLog b/ChangeLog
index 1c16a19ef3f03ed02eac05437e7e7d2c5242ea63..20e93573caae4e43dce5f065eaa840cddcb7313b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ o Added Postfix pipe backend support (Niki Guldbrand)
  o PHP admin interface bugfix (Niki Guldbrand)
  o Added support for static bounce addresses (Thomas Jarosch)
  o Added a sanity check in mlmmj-receive-strip (Chris Webb)

diff --git a/src/mlmmj-recieve.c b/src/mlmmj-recieve.c
index d8f96bd65e6d6b1f8cc2cdd7346ca5f921b398f6..3ee763de700a9cbc02bb2761eb06f3c04fc7c8be 100644 (file)
--- a/src/mlmmj-recieve.c
+++ b/src/mlmmj-recieve.c
@@ -42,10 +42,12 @@ extern char *optarg;
 
 static void print_help(const char *prg)
 {
-        printf("Usage: %s -L /path/to/listdir [-h] [-V] [-P] [-F]\n"
+        printf("Usage: %s -L /path/to/listdir [-s sender@example.org] [-e extension] [-h] [-V] [-P] [-F]\n"
               " -h: This help\n"
               " -F: Don't fork in the background\n"
               " -L: Full path to list directory\n"
+              " -s: Specify sender address\n"
+              " -e: The foo part of user+foo@example.org\n"
               " -P: Don't execute mlmmj-process\n"
               " -V: Print version\n", prg);
        exit(EXIT_SUCCESS);
@@ -69,7 +71,7 @@ int main(int argc, char **argv)
        mlmmjprocess = concatstr(2, bindir, "/mlmmj-process");
        myfree(bindir);
        
-       while ((opt = getopt(argc, argv, "hPVL:F")) != -1) {
+       while ((opt = getopt(argc, argv, "hPVL:s:e:F")) != -1) {
                switch(opt) {
                case 'h':
                        print_help(argv[0]);
@@ -77,6 +79,12 @@ int main(int argc, char **argv)
                case 'L':
                        listdir = optarg;
                        break;
+               case 's':
+                       setenv("SENDER", optarg, 1);
+                       break;
+               case 'e':
+                       setenv("EXTENSION", optarg, 1);
+                       break;
                case 'P':
                        noprocess = 1;
                        break;