From 21bfb443b78e3520fc650bebe356e2ebd56f03eb Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 22 Oct 1998 14:05:24 +0000 Subject: Prevent auth kerberos_v4, proto KPOP, from fooing up. svn path=/trunk/; revision=2132 --- rcfile_l.l | 4 ++-- rcfile_y.y | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rcfile_l.l b/rcfile_l.l index 2be9938b..b49311b4 100644 --- a/rcfile_l.l +++ b/rcfile_l.l @@ -42,9 +42,9 @@ service { return SERVICE; } port { return PORT; } interval { return INTERVAL; } auth(enticate)? { return AUTHENTICATE; } -kerberos_v4 { return KERBEROS4; } +kerberos(_v)?4 { return KERBEROS4; } +kerberos(_v)?5 { return KERBEROS5; } kerberos { return KERBEROS; } -kerberos_v5 { return KERBEROS5; } timeout { return TIMEOUT;} envelope { return ENVELOPE; } qvirtual { return QVIRTUAL; } diff --git a/rcfile_y.y b/rcfile_y.y index e86fe984..0e8ce1ac 100644 --- a/rcfile_y.y +++ b/rcfile_y.y @@ -128,10 +128,12 @@ serv_option : AKA alias_list | PROTOCOL PROTO {current.server.protocol = $2;} | PROTOCOL KPOP { current.server.protocol = P_POP3; + + if (current.server.preauthenticate == A_PASSWORD) #ifdef KERBEROS_V5 - current.server.preauthenticate = A_KERBEROS_V5; + current.server.preauthenticate = A_KERBEROS_V5; #else - current.server.preauthenticate = A_KERBEROS_V4; + current.server.preauthenticate = A_KERBEROS_V4; #endif /* KERBEROS_V5 */ #if INET6 current.server.service = KPOP_PORT; -- cgit v1.2.3