dovecot-2.2: Use "tokenlogin" socket name (instead of "token-log...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/9ad9a79c1747
changeset: 15051:9ad9a79c1747
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Sep 14 23:11:27 2012 +0300
description:
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.

diffstat:

 src/auth/auth-settings.c        |  2 +-
 src/login-common/login-common.h |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 172a75b3bed8 -r 9ad9a79c1747 src/auth/auth-settings.c
--- a/src/auth/auth-settings.c	Fri Sep 14 22:10:49 2012 +0300
+++ b/src/auth/auth-settings.c	Fri Sep 14 23:11:27 2012 +0300
@@ -17,7 +17,7 @@
 /* <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 -r 172a75b3bed8 -r 9ad9a79c1747 src/login-common/login-common.h
--- a/src/login-common/login-common.h	Fri Sep 14 22:10:49 2012 +0300
+++ b/src/login-common/login-common.h	Fri Sep 14 23:11:27 2012 +0300
@@ -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 */