Use "tokenlogin" socket name (instead of "token-login") after all.

Auth code has special checks for '-', which breaks "token-login" and fixing
it is rather annoying.

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 49d3b180e1dd261e83f344f8c5dd42f0dfc6b79e..601dc2d259db149f8b1c42f4d0e2e7db5c5e4d67 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -17,7 +17,7 @@ static bool auth_userdb_settings_check(void *_set, pool_t pool, const char **err
 /* <settings checks> */
 static struct file_listener_settings auth_unix_listeners_array[] = {
        { "login/login", 0666, "", "" },
-       { "token-login/token-login", 0666, "", "" },
+       { "token-login/tokenlogin", 0666, "", "" },
        { "auth-login", 0600, "$default_internal_user", "" },
        { "auth-client", 0600, "", "" },
        { "auth-userdb", 0666, "$default_internal_user", "" },

diff --git a/src/login-common/login-common.h b/src/login-common/login-common.h
index 42e3d67edd32be03485ca9b73d6810541dd39d35..1d4862d8a69a2c2ceae44b9595b59686884632be 100644 (file)
--- a/src/login-common/login-common.h
+++ b/src/login-common/login-common.h
@@ -13,7 +13,7 @@
        "Plaintext authentication disallowed on non-secure (SSL/TLS) connections."
 
 #define LOGIN_DEFAULT_SOCKET "login"
-#define LOGIN_TOKEN_DEFAULT_SOCKET "token-login"
+#define LOGIN_TOKEN_DEFAULT_SOCKET "tokenlogin"
 
 struct login_binary {
        /* e.g. imap, pop3 */