From b1be76de8f184485753349ec27b2cdf2a4530965 Mon Sep 17 00:00:00 2001 From: Dan Harkless Date: Fri, 17 Mar 2000 20:11:03 +0000 Subject: [PATCH] wesley.craig@umich.edu did not document his previous KPOP patch, so I did so, and asked him to check what I wrote. Unfortunately he didn't notice my misunderstanding of his patch. I wrote that if you #define POPSERVICE "kpop", inc and msgchk will use KPOP exclusively, but if you leave it as "pop3", you can use Wesley's new -kpop switch on a given invocation. Instead, however, -kpop turned out to be necessary on every invocation, and a KPOP user complained. Applied Wesley's new patch, which makes things work like I thought his original patch did. After that, did one more clarifying pass to the documentation in inc.man and msgchk.man. --- ChangeLog | 13 +++++++++++++ man/inc.man | 7 ++++--- man/msgchk.man | 7 ++++--- uip/inc.c | 3 +++ uip/msgchk.c | 3 +++ 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe729fa..9caf15e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Fri Mar 17 11:59:33 2000 Dan Harkless + + * wesley.craig@umich.edu did not document his previous KPOP patch, + so I did so, and asked him to check what I wrote. Unfortunately + he didn't notice my misunderstanding of his patch. I wrote that + if you #define POPSERVICE "kpop", inc and msgchk will use KPOP + exclusively, but if you leave it as "pop3", you can use Wesley's + new -kpop switch on a given invocation. Instead, however, -kpop + turned out to be necessary on every invocation, and a KPOP user + complained. Applied Wesley's new patch, which makes things work + like I thought his original patch did. After that, did one more + clarifying pass to the documentation in inc.man and msgchk.man. + Wed Mar 15 18:45:45 2000 Dan Harkless * When I fixed the long-standing makedir() bugs in January, I had diff --git a/man/inc.man b/man/inc.man index dda206c..8c11b2f 100644 --- a/man/inc.man +++ b/man/inc.man @@ -147,9 +147,10 @@ For debugging purposes, you may give the switch `\-snoop', which will allow you to watch the POP transaction take place between you and the POP server. -If nmh has been compiled with KPOP #defined, but without POPSERVICE being set to -"kpop", the -kpop switch may be specified to cause the use of Kerberized POP -rather than standard POP3 during a given invocation of \fIinc\fR. +If nmh has been compiled with KPOP #defined, the `\-kpop' switch will allow +\fIinc\fR to use Kerberized POP rather than standard POP3 on a given invocation. +If POPSERVICE was also #defined to "kpop", \fIinc\fR will be hardwired to always +use KPOP. %nmhendpop% .Fi ^$HOME/\&.mh\(ruprofile~^The user profile diff --git a/man/msgchk.man b/man/msgchk.man index 973fb4b..5054c33 100644 --- a/man/msgchk.man +++ b/man/msgchk.man @@ -77,9 +77,10 @@ For debugging purposes, there is also a switch `\-snoop', which will allow you to watch the POP transaction take place between you and the POP server. -If nmh has been compiled with KPOP #defined, but without POPSERVICE being set to -"kpop", the -kpop switch may be specified to cause the use of Kerberized POP -rather than standard POP3 during a given invocation of \fImsgchk\fR. +If nmh has been compiled with KPOP #defined, the `\-kpop' switch will allow +\fImsgchk\fR to use Kerberized POP rather than standard POP3 on a given +invocation. If POPSERVICE was also #defined to "kpop", \fImsgchk\fR will be +hardwired to always use KPOP. %nmhendpop% .Fi ^$HOME/\&.mh\(ruprofile~^The user profile diff --git a/uip/inc.c b/uip/inc.c index f00c337..0d36423 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -402,6 +402,9 @@ main (int argc, char **argv) if (inc_type == INC_POP) { if (user == NULL) user = getusername (); + if ( strcmp( POPSERVICE, "kpop" ) == 0 ) { + kpop = 1; + } if (kpop || ( rpop > 0)) pass = getusername (); else diff --git a/uip/msgchk.c b/uip/msgchk.c index 2553c49..d91330b 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -259,6 +259,9 @@ main (int argc, char **argv) #ifdef POP if (host) { + if ( strcmp( POPSERVICE, "kpop" ) == 0 ) { + kpop = 1; + } if (vecp == 0) { status = remotemail (host, user, rpop, kpop, notifysw, 1, snoop); } else { -- 1.7.10.4