Mercurial > dovecot > core-2.2
changeset 10144:19e67ad17398 HEAD
Changed anvil ident string to have the protocol first, so username can contain '/' chars.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 22 Oct 2009 20:08:11 -0400 |
| parents | a173fa193324 |
| children | 1110edddec36 |
| files | src/imap/imap-client.c src/login-common/sasl-server.c src/pop3/pop3-client.c |
| diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/imap-client.c Thu Oct 22 19:24:01 2009 -0400 +++ b/src/imap/imap-client.c Thu Oct 22 20:08:11 2009 -0400 @@ -73,7 +73,7 @@ ident = mail_user_get_anvil_userip_ident(client->user); if (ident != NULL) { master_service_anvil_send(master_service, t_strconcat( - "CONNECT\t", my_pid, "\t", ident, "/imap\n", NULL)); + "CONNECT\t", my_pid, "\timap/", ident, "\n", NULL)); client->anvil_sent = TRUE; } @@ -185,8 +185,8 @@ } if (client->anvil_sent) { master_service_anvil_send(master_service, t_strconcat( - "DISCONNECT\t", my_pid, "\t", - mail_user_get_anvil_userip_ident(client->user), "/imap" + "DISCONNECT\t", my_pid, "\timap/", + mail_user_get_anvil_userip_ident(client->user), "\n", NULL)); } mail_user_unref(&client->user);
--- a/src/login-common/sasl-server.c Thu Oct 22 19:24:01 2009 -0400 +++ b/src/login-common/sasl-server.c Thu Oct 22 20:08:11 2009 -0400 @@ -143,9 +143,9 @@ if (client->set->mail_max_userip_connections == 0) return FALSE; - ident = t_strconcat("LOOKUP\t", net_ip2addr(&client->ip), "/", - str_tabescape(client->virtual_user), "/", - login_protocol, "\n", NULL); + ident = t_strconcat("LOOKUP\t", login_protocol, "/", + net_ip2addr(&client->ip), "/", + str_tabescape(client->virtual_user), "\n", NULL); if (write_full(anvil_fd, ident, strlen(ident)) < 0) { if (errno == EPIPE) { /* anvil process was probably recreated, don't bother
--- a/src/pop3/pop3-client.c Thu Oct 22 19:24:01 2009 -0400 +++ b/src/pop3/pop3-client.c Thu Oct 22 20:08:11 2009 -0400 @@ -262,7 +262,7 @@ ident = mail_user_get_anvil_userip_ident(client->user); if (ident != NULL) { master_service_anvil_send(master_service, t_strconcat( - "CONNECT\t", my_pid, "\t", ident, "/pop3\n", NULL)); + "CONNECT\t", my_pid, "\tpop3/", ident, "\n", NULL)); client->anvil_sent = TRUE; } @@ -346,8 +346,8 @@ mailbox_close(&client->mailbox); if (client->anvil_sent) { master_service_anvil_send(master_service, t_strconcat( - "DISCONNECT\t", my_pid, "\t", - mail_user_get_anvil_userip_ident(client->user), "/pop3" + "DISCONNECT\t", my_pid, "\tpop3/", + mail_user_get_anvil_userip_ident(client->user), "\n", NULL)); } mail_user_unref(&client->user);