use kerberos auth

[org.ibex.mail.git] / src / org / ibex / mail / Main.java

diff --git a/src/org/ibex/mail/Main.java b/src/org/ibex/mail/Main.java
index f354734..bd3014d 100644 (file)
--- 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)){