|
 |
30c5c5 |
diff --git a/conf/canonical b/conf/canonical
|
|
|
30c5c5 |
index 720db18..26937ce 100644
|
|
|
30c5c5 |
--- a/conf/canonical
|
|
|
30c5c5 |
+++ b/conf/canonical
|
|
|
30c5c5 |
@@ -82,9 +82,14 @@
|
|
|
30c5c5 |
#
|
|
|
30c5c5 |
# TABLE SEARCH ORDER
|
|
|
30c5c5 |
# With lookups from indexed files such as DB or DBM, or from
|
|
|
30c5c5 |
-# networked tables such as NIS, LDAP or SQL, patterns are
|
|
|
30c5c5 |
-# tried in the order as listed below:
|
|
|
30c5c5 |
-#
|
|
|
30c5c5 |
+# networked tables such as NIS, LDAP or SQL, each
|
|
|
30c5c5 |
+# user@domain query produces a sequence of query patterns as
|
|
|
30c5c5 |
+# described below.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
+# Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+# before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+# found.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
# user@domain address
|
|
|
30c5c5 |
# Replace user@domain by address. This form has the
|
|
|
30c5c5 |
# highest precedence.
|
|
|
30c5c5 |
diff --git a/conf/generic b/conf/generic
|
|
|
30c5c5 |
index d5ab42a..f66c2f4 100644
|
|
|
30c5c5 |
--- a/conf/generic
|
|
|
30c5c5 |
+++ b/conf/generic
|
|
|
30c5c5 |
@@ -72,9 +72,14 @@
|
|
|
30c5c5 |
#
|
|
|
30c5c5 |
# TABLE SEARCH ORDER
|
|
|
30c5c5 |
# With lookups from indexed files such as DB or DBM, or from
|
|
|
30c5c5 |
-# networked tables such as NIS, LDAP or SQL, patterns are
|
|
|
30c5c5 |
-# tried in the order as listed below:
|
|
|
30c5c5 |
-#
|
|
|
30c5c5 |
+# networked tables such as NIS, LDAP or SQL, each
|
|
|
30c5c5 |
+# user@domain query produces a sequence of query patterns as
|
|
|
30c5c5 |
+# described below.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
+# Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+# before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+# found.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
# user@domain address
|
|
|
30c5c5 |
# Replace user@domain by address. This form has the
|
|
|
30c5c5 |
# highest precedence.
|
|
|
30c5c5 |
diff --git a/conf/virtual b/conf/virtual
|
|
|
30c5c5 |
index 3be6ab9..1843622 100644
|
|
|
30c5c5 |
--- a/conf/virtual
|
|
|
30c5c5 |
+++ b/conf/virtual
|
|
|
30c5c5 |
@@ -81,9 +81,14 @@
|
|
|
30c5c5 |
#
|
|
|
30c5c5 |
# TABLE SEARCH ORDER
|
|
|
30c5c5 |
# With lookups from indexed files such as DB or DBM, or from
|
|
|
30c5c5 |
-# networked tables such as NIS, LDAP or SQL, patterns are
|
|
|
30c5c5 |
-# tried in the order as listed below:
|
|
|
30c5c5 |
-#
|
|
|
30c5c5 |
+# networked tables such as NIS, LDAP or SQL, each
|
|
|
30c5c5 |
+# user@domain query produces a sequence of query patterns as
|
|
|
30c5c5 |
+# described below.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
+# Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+# before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+# found.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
# user@domain address, address, ...
|
|
|
30c5c5 |
# Redirect mail for user@domain to address. This
|
|
|
30c5c5 |
# form has the highest precedence.
|
|
|
30c5c5 |
diff --git a/html/canonical.5.html b/html/canonical.5.html
|
|
|
30c5c5 |
index c97f910..1ef4aac 100644
|
|
|
30c5c5 |
--- a/html/canonical.5.html
|
|
|
30c5c5 |
+++ b/html/canonical.5.html
|
|
|
30c5c5 |
@@ -87,9 +87,12 @@ CANONICAL(5) CANONICAL(5)
|
|
|
30c5c5 |
cal line.
|
|
|
30c5c5 |
|
|
|
30c5c5 |
TABLE SEARCH ORDER
|
|
|
30c5c5 |
- With lookups from indexed files such as DB or DBM, or from
|
|
|
30c5c5 |
- networked tables such as NIS, LDAP or SQL, patterns are
|
|
|
30c5c5 |
- tried in the order as listed below:
|
|
|
30c5c5 |
+ With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
+ tables such as NIS, LDAP or SQL, each user@domain query produces a
|
|
|
30c5c5 |
+ sequence of query patterns as described below.
|
|
|
30c5c5 |
+
|
|
|
30c5c5 |
+ Each query pattern is sent to each specified lookup table before trying
|
|
|
30c5c5 |
+ the next query pattern, until a match is found.
|
|
|
30c5c5 |
|
|
|
30c5c5 |
user@domain address
|
|
|
30c5c5 |
Replace user@domain by address. This form has the
|
|
|
30c5c5 |
diff --git a/html/generic.5.html b/html/generic.5.html
|
|
|
30c5c5 |
index debee93..3294832 100644
|
|
|
30c5c5 |
--- a/html/generic.5.html
|
|
|
30c5c5 |
+++ b/html/generic.5.html
|
|
|
30c5c5 |
@@ -77,9 +77,12 @@ GENERIC(5) GENERIC(5)
|
|
|
30c5c5 |
cal line.
|
|
|
30c5c5 |
|
|
|
30c5c5 |
TABLE SEARCH ORDER
|
|
|
30c5c5 |
- With lookups from indexed files such as DB or DBM, or from
|
|
|
30c5c5 |
- networked tables such as NIS, LDAP or SQL, patterns are
|
|
|
30c5c5 |
- tried in the order as listed below:
|
|
|
30c5c5 |
+ With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
+ tables such as NIS, LDAP or SQL, each user@domain query produces a
|
|
|
30c5c5 |
+ sequence of query patterns as described below.
|
|
|
30c5c5 |
+
|
|
|
30c5c5 |
+ Each query pattern is sent to each specified lookup table before trying
|
|
|
30c5c5 |
+ the next query pattern, until a match is found.
|
|
|
30c5c5 |
|
|
|
30c5c5 |
user@domain address
|
|
|
30c5c5 |
Replace user@domain by address. This form has the
|
|
|
30c5c5 |
diff --git a/html/virtual.5.html b/html/virtual.5.html
|
|
|
30c5c5 |
index c92826c..7fa6329 100644
|
|
|
30c5c5 |
--- a/html/virtual.5.html
|
|
|
30c5c5 |
+++ b/html/virtual.5.html
|
|
|
30c5c5 |
@@ -86,9 +86,12 @@ VIRTUAL(5) VIRTUAL(5)
|
|
|
30c5c5 |
cal line.
|
|
|
30c5c5 |
|
|
|
30c5c5 |
TABLE SEARCH ORDER
|
|
|
30c5c5 |
- With lookups from indexed files such as DB or DBM, or from
|
|
|
30c5c5 |
- networked tables such as NIS, LDAP or SQL, patterns are
|
|
|
30c5c5 |
- tried in the order as listed below:
|
|
|
30c5c5 |
+ With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
+ tables such as NIS, LDAP or SQL, each user@domain query produces a
|
|
|
30c5c5 |
+ sequence of query patterns as described below.
|
|
|
30c5c5 |
+
|
|
|
30c5c5 |
+ Each query pattern is sent to each specified lookup table before trying
|
|
|
30c5c5 |
+ the next query pattern, until a match is found.
|
|
|
30c5c5 |
|
|
|
30c5c5 |
user@domain address, address, ...
|
|
|
30c5c5 |
Redirect mail for user@domain to address. This
|
|
|
30c5c5 |
diff --git a/man/man5/canonical.5 b/man/man5/canonical.5
|
|
|
30c5c5 |
index 1bf8d53..267495f 100644
|
|
|
30c5c5 |
--- a/man/man5/canonical.5
|
|
|
30c5c5 |
+++ b/man/man5/canonical.5
|
|
|
30c5c5 |
@@ -88,8 +88,12 @@ starts with whitespace continues a logical line.
|
|
|
30c5c5 |
.ad
|
|
|
30c5c5 |
.fi
|
|
|
30c5c5 |
With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
-tables such as NIS, LDAP or SQL, patterns are tried in the order as
|
|
|
30c5c5 |
-listed below:
|
|
|
30c5c5 |
+tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
|
|
|
30c5c5 |
+query produces a sequence of query patterns as described below.
|
|
|
30c5c5 |
+
|
|
|
30c5c5 |
+Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+found.
|
|
|
30c5c5 |
.IP "\fIuser\fR@\fIdomain address\fR"
|
|
|
30c5c5 |
Replace \fIuser\fR@\fIdomain\fR by \fIaddress\fR. This form
|
|
|
30c5c5 |
has the highest precedence.
|
|
|
30c5c5 |
diff --git a/man/man5/generic.5 b/man/man5/generic.5
|
|
|
30c5c5 |
index 13b9dd0..1153f58 100644
|
|
|
30c5c5 |
--- a/man/man5/generic.5
|
|
|
30c5c5 |
+++ b/man/man5/generic.5
|
|
|
30c5c5 |
@@ -80,8 +80,12 @@ starts with whitespace continues a logical line.
|
|
|
30c5c5 |
.ad
|
|
|
30c5c5 |
.fi
|
|
|
30c5c5 |
With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
-tables such as NIS, LDAP or SQL, patterns are tried in the order as
|
|
|
30c5c5 |
-listed below:
|
|
|
30c5c5 |
+tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
|
|
|
30c5c5 |
+query produces a sequence of query patterns as described below.
|
|
|
30c5c5 |
+
|
|
|
30c5c5 |
+Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+found.
|
|
|
30c5c5 |
.IP "\fIuser\fR@\fIdomain address\fR"
|
|
|
30c5c5 |
Replace \fIuser\fR@\fIdomain\fR by \fIaddress\fR. This form
|
|
|
30c5c5 |
has the highest precedence.
|
|
|
30c5c5 |
diff --git a/man/man5/virtual.5 b/man/man5/virtual.5
|
|
|
30c5c5 |
index da139f8..241bf10 100644
|
|
|
30c5c5 |
--- a/man/man5/virtual.5
|
|
|
30c5c5 |
+++ b/man/man5/virtual.5
|
|
|
30c5c5 |
@@ -86,8 +86,12 @@ starts with whitespace continues a logical line.
|
|
|
30c5c5 |
.ad
|
|
|
30c5c5 |
.fi
|
|
|
30c5c5 |
With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
-tables such as NIS, LDAP or SQL, patterns are tried in the order as
|
|
|
30c5c5 |
-listed below:
|
|
|
30c5c5 |
+tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
|
|
|
30c5c5 |
+query produces a sequence of query patterns as described below.
|
|
|
30c5c5 |
+
|
|
|
30c5c5 |
+Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+found.
|
|
|
30c5c5 |
.IP "\fIuser\fR@\fIdomain address, address, ...\fR"
|
|
|
30c5c5 |
Redirect mail for \fIuser\fR@\fIdomain\fR to \fIaddress\fR.
|
|
|
30c5c5 |
This form has the highest precedence.
|
|
|
30c5c5 |
diff --git a/proto/canonical b/proto/canonical
|
|
|
30c5c5 |
index cdda918..6255ba2 100644
|
|
|
30c5c5 |
--- a/proto/canonical
|
|
|
30c5c5 |
+++ b/proto/canonical
|
|
|
30c5c5 |
@@ -76,8 +76,12 @@
|
|
|
30c5c5 |
# .ad
|
|
|
30c5c5 |
# .fi
|
|
|
30c5c5 |
# With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
-# tables such as NIS, LDAP or SQL, patterns are tried in the order as
|
|
|
30c5c5 |
-# listed below:
|
|
|
30c5c5 |
+# tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
|
|
|
30c5c5 |
+# query produces a sequence of query patterns as described below.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
+# Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+# before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+# found.
|
|
|
30c5c5 |
# .IP "\fIuser\fR@\fIdomain address\fR"
|
|
|
30c5c5 |
# Replace \fIuser\fR@\fIdomain\fR by \fIaddress\fR. This form
|
|
|
30c5c5 |
# has the highest precedence.
|
|
|
30c5c5 |
diff --git a/proto/generic b/proto/generic
|
|
|
30c5c5 |
index b2e730a..25db840 100644
|
|
|
30c5c5 |
--- a/proto/generic
|
|
|
30c5c5 |
+++ b/proto/generic
|
|
|
30c5c5 |
@@ -68,8 +68,12 @@
|
|
|
30c5c5 |
# .ad
|
|
|
30c5c5 |
# .fi
|
|
|
30c5c5 |
# With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
-# tables such as NIS, LDAP or SQL, patterns are tried in the order as
|
|
|
30c5c5 |
-# listed below:
|
|
|
30c5c5 |
+# tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
|
|
|
30c5c5 |
+# query produces a sequence of query patterns as described below.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
+# Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+# before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+# found.
|
|
|
30c5c5 |
# .IP "\fIuser\fR@\fIdomain address\fR"
|
|
|
30c5c5 |
# Replace \fIuser\fR@\fIdomain\fR by \fIaddress\fR. This form
|
|
|
30c5c5 |
# has the highest precedence.
|
|
|
30c5c5 |
diff --git a/proto/virtual b/proto/virtual
|
|
|
30c5c5 |
index 8a2d28f..1fc30aa 100644
|
|
|
30c5c5 |
--- a/proto/virtual
|
|
|
30c5c5 |
+++ b/proto/virtual
|
|
|
30c5c5 |
@@ -74,8 +74,12 @@
|
|
|
30c5c5 |
# .ad
|
|
|
30c5c5 |
# .fi
|
|
|
30c5c5 |
# With lookups from indexed files such as DB or DBM, or from networked
|
|
|
30c5c5 |
-# tables such as NIS, LDAP or SQL, patterns are tried in the order as
|
|
|
30c5c5 |
-# listed below:
|
|
|
30c5c5 |
+# tables such as NIS, LDAP or SQL, each \fIuser\fR@\fIdomain\fR
|
|
|
30c5c5 |
+# query produces a sequence of query patterns as described below.
|
|
|
30c5c5 |
+#
|
|
|
30c5c5 |
+# Each query pattern is sent to each specified lookup table
|
|
|
30c5c5 |
+# before trying the next query pattern, until a match is
|
|
|
30c5c5 |
+# found.
|
|
|
30c5c5 |
# .IP "\fIuser\fR@\fIdomain address, address, ...\fR"
|
|
|
30c5c5 |
# Redirect mail for \fIuser\fR@\fIdomain\fR to \fIaddress\fR.
|
|
|
30c5c5 |
# This form has the highest precedence.
|