Implement plus addressing for virtualdomains

1 files changed, 19 insertions, 0 deletions

diff --git a/qmail-send.c b/qmail-send.c
index 0baed66..6eac4d5 100644
--- a/qmail-send.c
+++ b/qmail-send.c
@@ -160,6 +160,25 @@ char *recip;
         return 1;
       }
  
+  static stralloc newaddr = {0};
+  for (i = at; i > 0; --i) {
+    if (addr.s[i] == '+' /*|| addr.s[i] == '-'*/) {
+      if (i == at - 1) break;
+      if (!stralloc_copyb(&newaddr, addr.s, i)) return 0;
+      if (!stralloc_catb(&newaddr, addr.s + at, addr.len - at)) return 0;
+      if (x = constmap(&mapvdoms, newaddr.s, newaddr.len)) {
+        if (!*x) break;
+        if (!stralloc_cats(&rwline, x)) return 0;
+        if (!stralloc_cats(&rwline, "-")) return 0;
+        addr.s[i] = '-';
+        if (!stralloc_cat(&rwline, &addr)) return 0;
+        if (!stralloc_0(&rwline)) return 0;
+        return 1;
+      }
+      break;
+    }
+  }
+
   if (!stralloc_cat(&rwline,&addr)) return 0;
   if (!stralloc_0(&rwline)) return 0;
   return 2;