From: adamch <adamch>
Date: Sat, 15 Dec 2007 18:45:58 +0000 (+0000)
Subject: Move catchAllAlias to Alias module
X-Git-Url: http://git.hcoop.net/hcoop/zz_old/domtool2-proto.git/commitdiff_plain/940e3663168fb7dac30a238d7a33a8c69a6c6f9b

Move catchAllAlias to Alias module
---

diff --git a/lib/alias.dtl b/lib/alias.dtl
index 113654b..6e0a3ff 100644
--- a/lib/alias.dtl
+++ b/lib/alias.dtl
@@ -41,5 +41,8 @@ val aliasDrop = \user -> aliasPrim (userSource user) dropTarget;
 {{Silently delete mail to the user at the current domain.}}
 
 val defaultAlias = \email -> aliasPrim defaultSource (addressTarget email);
+{{When a message to the current domain doesn't match any other alias and isn't a
+  UNIX username, send it to this e-mail address.}}
+val catchAllAlias = \email -> aliasPrim catchAllSource (addressTarget email);
 {{When a message to the current domain doesn't match any other alias, send it to
   this e-mail address.}}
diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index 795dd08..952bcfb 100644
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -30,8 +30,6 @@ val webAtIp =
 	  end
 	end;
 
-val catchAllAlias = \ mailbox -> aliasPrim catchAllSource (addressTarget mailbox);
-
 val addCatchAllAlias = begin
   mailbox <- Mailbox;
   catchAllAlias mailbox
diff --git a/pcre/mlton/libpcre-h.sml b/pcre/mlton/libpcre-h.sml
index 356df39..f45d82f 100644
--- a/pcre/mlton/libpcre-h.sml
+++ b/pcre/mlton/libpcre-h.sml
@@ -1,4 +1,4 @@
-structure LibpcreH = struct
+structure LibpcreiH = struct
     local
         val lh = DynLinkage.open_lib
              { name = "/usr/local/lib/pcre_sml.so", global = true, lazy = true }