Index: trunk/server/fedora/config/etc/postfix/main.cf
===================================================================
--- trunk/server/fedora/config/etc/postfix/main.cf	(revision 2459)
+++ trunk/server/fedora/config/etc/postfix/main.cf	(revision 2460)
@@ -30,5 +30,5 @@
 mail_owner = postfix
 virtual_alias_domains = hash:/etc/postfix/virtual, regexp:/etc/postfix/virtual_re, ldap:/etc/postfix/virtual-alias-domains-ldap.cf
-virtual_alias_maps = hash:/etc/postfix/virtual, regexp:/etc/postfix/virtual_re, ldap:/etc/postfix/virtual-alias-maps-ldap.cf
+virtual_alias_maps = hash:/etc/postfix/virtual, regexp:/etc/postfix/virtual_re, ldap:/etc/postfix/virtual-alias-maps-ldap-reserved.cf, ldap:/etc/postfix/virtual-alias-maps-ldap.cf
 data_directory = /var/lib/postfix
 authorized_submit_users = !/etc/postfix/blocked_users, static:all
Index: trunk/server/fedora/config/etc/postfix/virtual-alias-maps-ldap-reserved.cf
===================================================================
--- trunk/server/fedora/config/etc/postfix/virtual-alias-maps-ldap-reserved.cf	(revision 2460)
+++ trunk/server/fedora/config/etc/postfix/virtual-alias-maps-ldap-reserved.cf	(revision 2460)
@@ -0,0 +1,7 @@
+server_host = ldapi://%2fvar%2frun%2fslapd-scripts.socket/
+search_base = ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
+query_filter = (&(objectClass=scriptsVhost)(|(scriptsVhostName=%d)(scriptsVhostAlias=%d))(!(scriptsVhostName=scripts.mit.edu))(scriptsReservedMail=%u))
+result_attribute = scriptsVhostName
+result_format = %U
+bind = no
+version = 3
Index: trunk/server/fedora/config/etc/postfix/virtual_re
===================================================================
--- trunk/server/fedora/config/etc/postfix/virtual_re	(revision 2459)
+++ trunk/server/fedora/config/etc/postfix/virtual_re	(revision 2460)
@@ -1,4 +1,4 @@
 /^(.*)@scripts\.mit\.edu$/ $1@scripts.mit.edu
-/^(abuse|hostmaster|noc|postmaster|security)@/ $1@scripts.mit.edu
+/^(abuse|hostmaster|noc|postmaster|security)@[^@]*\.scripts\.mit\.edu$/ $1@scripts.mit.edu
 /^(.*)@([^@]*)\.scripts\.mit\.edu$/ $2+$1
 /^([^@]*)\.scripts\.mit\.edu$/ true