aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorFrancesco Potortì2006-05-23 10:44:39 +0000
committerFrancesco Potortì2006-05-23 10:44:39 +0000
commit81264b3846c31bd987a7788fa656dd76345cc8e7 (patch)
treebc1bc08bc7fee9e68caef1d5844098bac1d8014d /lib-src
parent8a6d5da7cc56803406d391456105c6a37e1e0671 (diff)
downloademacs-81264b3846c31bd987a7788fa656dd76345cc8e7.tar.gz
emacs-81264b3846c31bd987a7788fa656dd76345cc8e7.zip
(pop_open, socket_connection, KPOP_SERVICE): Added
comments explaining why the "kpop" service is never used.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/pop.c9
1 files changed, 6 insertions, 3 deletions
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));
135#define KPOP_PORT 1109 135#define KPOP_PORT 1109
136#define POP_SERVICE "pop3" /* we don't want the POP2 port! */ 136#define POP_SERVICE "pop3" /* we don't want the POP2 port! */
137#ifdef KERBEROS 137#ifdef KERBEROS
138#define KPOP_SERVICE "kpop" 138#define KPOP_SERVICE "kpop" /* never used: look for 20060515 to see why */
139#endif 139#endif
140 140
141char pop_error[ERROR_MAX]; 141char pop_error[ERROR_MAX];
@@ -264,10 +264,11 @@ pop_open (host, username, password, flags)
264 return (0); 264 return (0);
265 } 265 }
266 } 266 }
267 if (password) 267 if (password) /* always true, detected 20060515 */
268 flags |= POP_NO_KERBEROS; 268 flags |= POP_NO_KERBEROS;
269 else 269 else
270 password = username; 270 password = username; /* dead code, detected 20060515 */
271 /** "kpop" service is never used: look for 20060515 to see why **/
271 272
272 sock = socket_connection (host, flags); 273 sock = socket_connection (host, flags);
273 if (sock == -1) 274 if (sock == -1)
@@ -1047,6 +1048,7 @@ socket_connection (host, flags)
1047 bzero ((char *) &addr, sizeof (addr)); 1048 bzero ((char *) &addr, sizeof (addr));
1048 addr.sin_family = AF_INET; 1049 addr.sin_family = AF_INET;
1049 1050
1051 /** "kpop" service is never used: look for 20060515 to see why **/
1050#ifdef KERBEROS 1052#ifdef KERBEROS
1051 service = (flags & POP_NO_KERBEROS) ? POP_SERVICE : KPOP_SERVICE; 1053 service = (flags & POP_NO_KERBEROS) ? POP_SERVICE : KPOP_SERVICE;
1052#else 1054#else
@@ -1073,6 +1075,7 @@ socket_connection (host, flags)
1073 } 1075 }
1074 else 1076 else
1075 { 1077 {
1078 /** "kpop" service is never used: look for 20060515 to see why **/
1076#ifdef KERBEROS 1079#ifdef KERBEROS
1077 addr.sin_port = htons ((flags & POP_NO_KERBEROS) ? 1080 addr.sin_port = htons ((flags & POP_NO_KERBEROS) ?
1078 POP_PORT : KPOP_PORT); 1081 POP_PORT : KPOP_PORT);