From: Timo Sirainen <tss@iki.fi>
Date: Fri, 14 Sep 2012 20:11:27 +0000 (+0300)
Subject: Use "tokenlogin" socket name (instead of "token-login") after all.
X-Git-Tag: 2.2.alpha1~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46ec5983bf4519ea42dbfcae3d7c62be0d8ef95f;p=thirdparty%2Fdovecot%2Fcore.git

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 49d3b180e1..601dc2d259 100644
--- 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 42e3d67edd..1d4862d8a6 100644
--- 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 */