auth code cleanup

diff --git a/include/bouncer.h b/include/bouncer.h
index ca33199108655e8c34f923e356b9c84d7351d552..2da384e5c64d8c6edbc5d15e18416c65d00725b2 100644 (file)
--- a/include/bouncer.h
+++ b/include/bouncer.h
@@ -115,13 +115,19 @@ extern int cf_sbuf_len;
 #define MAX_USERNAME   64
 #define MAX_PASSWORD   64
 
-/* auth modes, should match PG's */
+/* no-auth modes */
 #define AUTH_ANY       -1 /* same as trust but without username check */
-#define AUTH_TRUST     0
+#define AUTH_TRUST     AUTH_OK
+
+/* protocol codes */
+#define AUTH_OK                0
+#define AUTH_KRB       2
 #define AUTH_PLAIN     3
-/* #define AUTH_CRYPT  4 */
+#define AUTH_CRYPT     4
 #define AUTH_MD5       5
-/* #define AUTH_CREDS  6 */
+#define AUTH_CREDS     6
+
+/* internal codes */
 #define AUTH_CERT      7
 #define AUTH_PEER      8
 #define AUTH_HBA       9

diff --git a/src/proto.c b/src/proto.c
index 670b7c78cd3628abd73ed159a8b3e853de3f4504..2f86481b459db02897704428ee64cfea2101fc8c 100644 (file)
--- a/src/proto.c
+++ b/src/proto.c
@@ -306,27 +306,22 @@ bool answer_authreq(PgSocket *server, PktHdr *pkt)
        if (!mbuf_get_uint32be(&pkt->data, &cmd))
                return false;
        switch (cmd) {
-       case 0:
+       case AUTH_OK:
                slog_debug(server, "S: auth ok");
                res = true;
                break;
-       case 3:
+       case AUTH_PLAIN:
                slog_debug(server, "S: req cleartext password");
                res = login_clear_psw(server);
                break;
-       case 5:
+       case AUTH_MD5:
                slog_debug(server, "S: req md5-crypted psw");
                if (!mbuf_get_bytes(&pkt->data, 4, &salt))
                        return false;
                res = login_md5_psw(server, salt);
                break;
-       case 2: /* kerberos */
-       case 6: /* deprecated usage of SCM_RIGHTS */
-               slog_error(server, "unsupported auth method: %d", cmd);
-               res = false;
-               break;
        default:
-               slog_error(server, "unknown auth method: %d", cmd);
+               slog_error(server, "unknown/unsupported auth method: %d", cmd);
                res = false;
                break;
        }