From 1d1c07809f7d00e32e8abd14ce2bb1f5f38e122c Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Fri, 2 Feb 2007 23:34:11 +0000
Subject: Add Miloslav Trmac's patch to fix KPOP regression in 6.3.6.

svn path=/branches/BRANCH_6-3/; revision=5020
---
 pop3.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pop3.c')

diff --git a/pop3.c b/pop3.c
index 3acc5923..f979e838 100644
--- a/pop3.c
+++ b/pop3.c
@@ -612,7 +612,11 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 
 	/* check if we are actually allowed to send the password */
 	if (ctl->server.authenticate == A_ANY
-		|| ctl->server.authenticate == A_PASSWORD) {
+	    || ctl->server.authenticate == A_PASSWORD
+	    || ((ctl->server.authenticate == A_KERBEROS_V4
+		 || ctl->server.authenticate == A_KERBEROS_V5)
+		&& ctl->server.service
+		&& strcmp(ctl->server.service, KPOP_PORT) == 0)) {
 	    strlcpy(shroud, ctl->password, sizeof(shroud));
 	    ok = gen_transact(sock, "PASS %s", ctl->password);
 	} else {
-- 
cgit v1.2.3