Cleanup.

svn path=/trunk/; revision=1643

diff --git a/NEWS b/NEWS
index 43cab268ddf6eb32418c7e53af60373a2836e2f7..f5d2afd2a3249179e0a06fd5b827ca0278ef4f3f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@
 * Read from /etc/fetchmailrc before ~/.fetchmailrc?
 * Do is_host_alias checks by comparing IP addresses rather than names?
 * Make the antispam response configurable.
+* Handle multi-homed hosts correctly.
 
                                Other TO-DO items:
 

diff --git a/fetchmail.h b/fetchmail.h
index 2b42de3708f5abdade17f3c10ac294ebd00335cd..50ce5640a95a64e753333576ae193e3bbf1a2bfd 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -8,10 +8,10 @@
 #define                P_POP3          3
 #define                P_IMAP          4
 #define                P_IMAP_K4       5
-#define                P_APOP          6
-#define                P_RPOP          7
-#define                P_ETRN          8
-#define                P_IMAP_GSS      9
+#define                P_IMAP_GSS      6
+#define                P_APOP          7
+#define                P_RPOP          8
+#define                P_ETRN          9
 
 #if INET6
 #define                KPOP_PORT       "kpop"

diff --git a/uid.c b/uid.c
index 50d8ede6becafd2f1a1e27e3380211431e8175c7..54d415894f96bdba3f38ed1bec3a834a0ec1cb80 100644 (file)
--- a/uid.c
+++ b/uid.c
@@ -42,11 +42,9 @@
  * not respond to the request for a UID listing.
  *
  * Each time a message is fetched, we can check its UID against the
- * `oldsaved' list to see if it is old.  If not, it should be downloaded
- * (and possibly deleted).  It should be downloaded anyway if --all
- * is on.  It should not be deleted if --keep is on.
+ * `oldsaved' list to see if it is old.
  *
- * Each time a message is deleted, we mark its id UID_DELETED from the
+ * Each time a message is deleted, we mark its id UID_DELETED in the
  * `newsaved' member.  When we want to assert that an expunge has been
  * done on the server, we call expunge_uid() to register that all
  * deleted messages are gone by marking them UID_EXPUNGED.