Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-289
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-290
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-291
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-292
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-293
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-567

2 files changed, 11 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 16c4e538939..9ba3191ed46 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-23  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * pop.c (pop_open, socket_connection, KPOP_SERVICE): Added
+        comments explaining why the "kpop" service is never used.
+
 2006-05-13  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (lisp1): Add fringe.elc.
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 7d6bcc5cdc9..5dcbf2d2483 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -135,7 +135,7 @@ static char *find_crlf __P((char *, int));
 #define KPOP_PORT 1109
 #define POP_SERVICE "pop3"      /* we don't want the POP2 port! */
 #ifdef KERBEROS
-#define KPOP_SERVICE "kpop"
+#define KPOP_SERVICE "kpop"     /* never used: look for 20060515 to see why */
 #endif
 
 char pop_error[ERROR_MAX];
@@ -264,10 +264,11 @@ pop_open (host, username, password, flags)
           return (0);
         }
     }
-  if (password)
+  if (password)                 /* always true, detected 20060515 */
     flags |= POP_NO_KERBEROS;
   else
-    password = username;
+    password = username;        /* dead code, detected 20060515 */
+  /** "kpop" service is  never used: look for 20060515 to see why **/
 
   sock = socket_connection (host, flags);
   if (sock == -1)
@@ -1047,6 +1048,7 @@ socket_connection (host, flags)
   bzero ((char *) &addr, sizeof (addr));
   addr.sin_family = AF_INET;
 
+  /** "kpop" service is  never used: look for 20060515 to see why **/
 #ifdef KERBEROS
   service = (flags & POP_NO_KERBEROS) ? POP_SERVICE : KPOP_SERVICE;
 #else
@@ -1073,6 +1075,7 @@ socket_connection (host, flags)
         }
       else
         {
+  /** "kpop" service is  never used: look for 20060515 to see why **/
 #ifdef KERBEROS
           addr.sin_port = htons ((flags & POP_NO_KERBEROS) ?
                                 POP_PORT : KPOP_PORT);