-auth(enticate)? { BEGIN(AUTHKIND); return AUTHENTICATE; }
-kerberos(_v)?4 { BEGIN(0); return KERBEROS4; }
-kerberos(_v)?5 { BEGIN(0); return KERBEROS5; }
-kerberos { BEGIN(0); return KERBEROS; }
-<AUTHKIND>password { BEGIN(0); return PASSWORD; }
+preauth(enticate)? { SETSTATE(AUTH); return AUTHENTICATE; }
+auth(enticate)? { SETSTATE(AUTH); return AUTHENTICATE; }
+any { SETSTATE(0); yylval.proto = A_ANY; return AUTHTYPE;}
+gssapi { SETSTATE(0); yylval.proto = A_GSSAPI; return AUTHTYPE;}
+kerberos(_v)?4 { SETSTATE(0); yylval.proto = A_KERBEROS_V4; return AUTHTYPE;}
+kerberos(_v)?5 { SETSTATE(0); yylval.proto = A_KERBEROS_V5; return AUTHTYPE;}
+kerberos { SETSTATE(0); yylval.proto = A_KERBEROS_V4; return AUTHTYPE;}
+ssh { SETSTATE(0); yylval.proto = A_SSH; return AUTHTYPE;}
+external { SETSTATE(0); yylval.proto = A_EXTERNAL; return AUTHTYPE;}
+(otp|opie) { SETSTATE(0); yylval.proto = A_OTP; return AUTHTYPE;}
+cram(-md5)? { SETSTATE(0); yylval.proto = A_CRAM_MD5; return AUTHTYPE;}
+msn { SETSTATE(0); yylval.proto = A_MSN; return AUTHTYPE;}
+ntlm { SETSTATE(0); yylval.proto = A_NTLM; return AUTHTYPE;}
+<AUTH>password { SETSTATE(0); yylval.proto = A_PASSWORD; return AUTHTYPE;}