dovecot-2.0: Changed anvil ident string to have the protocol fir...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Oct 23 03:08:15 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/19e67ad17398
changeset: 10144:19e67ad17398
user: Timo Sirainen <tss at iki.fi>
date: Thu Oct 22 20:08:11 2009 -0400
description:
Changed anvil ident string to have the protocol first, so username can contain '/' chars.
diffstat:
3 files changed, 9 insertions(+), 9 deletions(-)
src/imap/imap-client.c | 6 +++---
src/login-common/sasl-server.c | 6 +++---
src/pop3/pop3-client.c | 6 +++---
diffs (62 lines):
diff -r a173fa193324 -r 19e67ad17398 src/imap/imap-client.c
--- 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 @@ struct client *client_create(int fd_in,
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 @@ void client_destroy(struct client *clien
}
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);
diff -r a173fa193324 -r 19e67ad17398 src/login-common/sasl-server.c
--- 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 @@ static bool anvil_has_too_many_connectio
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
diff -r a173fa193324 -r 19e67ad17398 src/pop3/pop3-client.c
--- 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 @@ struct client *client_create(int fd_in,
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 @@ void client_destroy(struct client *clien
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);
More information about the dovecot-cvs
mailing list