From 42bf8edd6d7e7b2d04be859739b966e3e813cc63 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 17 Mar 2007 08:59:18 +0000 Subject: [PATCH] use kerberos auth darcs-hash:20070317085918-5007d-0354d45f3b2e74c32cc671d104365846fe730e84.gz --- src/org/ibex/mail/Main.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/org/ibex/mail/Main.java b/src/org/ibex/mail/Main.java index f354734..bd3014d 100644 --- a/src/org/ibex/mail/Main.java +++ b/src/org/ibex/mail/Main.java @@ -113,8 +113,8 @@ public class Main { } } - private static final Auth auth = new Auth(); - private static class Auth implements Login { + static final Auth auth = new Auth(); + static class Auth implements Login { private KerberosAuth ka = new KerberosAuth("MEGACZ.COM", "godel.megacz.com"); public Account anonymous() { try { @@ -130,11 +130,8 @@ public class Main { } public Object login(String user, String pass, Class protocol) { return login(user, pass); } public Account login(String user, String pass) { - if (!EtcPasswd.verify(user, pass)) return null; - - // currently broken, but should be used - //if (!ka.auth(user, pass)) return null; - + //if (!EtcPasswd.verify(user, pass)) return null; + if (!ka.auth(user, pass)) return null; final Mailbox root = FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT + "/user", true); return new Account(user, null, root.slash(user, true)){ -- 1.7.10.4