Enrico Musio's IP-checkalias patch.

svn path=/trunk/; revision=1945

diff --git a/design-notes.html b/design-notes.html
index 5e8721d7f827a86ba680bff403d0a51f4207bc3a..ae45d54d41f4357db6d268286380f344cbfeaeb3 100644 (file)
--- a/design-notes.html
+++ b/design-notes.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 1998/06/03 14:54:27 $
+<td width="30%" align=right>$Date: 1998/06/29 21:38:03 $
 </table>
 <HR>
 <H1 ALIGN=CENTER>Design Notes On Fetchmail</H1>
@@ -326,8 +326,8 @@ following minimum steps.
 
 <LI>Add code to dump the option value in <code>fetchmail.c:dump_params</code>.
 
-<LI>Add proper <code>FLAG_FORCE</code> and <code>FLAG_MERGE</code> actions
-    in fetchmail.c's optmerge function.
+<LI>Add proper <code>FLAG_MERGE</code> actions in fetchmail.c's
+    optmerge() function.
 
 <LI>Document the option in fetchmail.man.  This will require at least
     two changes; one to the collected table of options, and one full
@@ -477,7 +477,7 @@ all shaped the design in one way or another.<P>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 1998/06/03 14:54:27 $
+<td width="30%" align=right>$Date: 1998/06/29 21:38:03 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>

diff --git a/sample.rcfile b/sample.rcfile
index 9c12f2a160ff98209a2a1ff25b57a668789c6ed8..b1e8da063e5f85e78bdc0fa81f8dae8f7ce525c9 100644 (file)
--- a/sample.rcfile
+++ b/sample.rcfile
@@ -1,4 +1,4 @@
-# fetchmail control file sample
+# fetchmail control file sample (remove this header comment from yours!)
 #
 # This file (or one of your own creation, rather) should be located 
 # in your home directory with the name .fetchmailrc.  Permissions on this
@@ -36,8 +36,10 @@
 #   localdomains              -- must be followed by one or more domain names
 #   interface                 -- must be followed by device/IP address/mask
 #   monitor                   -- must be followed by device
-#   no dns
 #   dns
+#   no dns
+#   checkalias                -- do multidrop address compaison by IP address
+#   no checkalias             -- do multidrop address compaison by name
 #
 #   username (or user)        -- must be followed by a name
 #   is                        -- must be followed by one or more names