[dovecot-cvs] dovecot/src/login client-authenticate.c,1.30,1.31 client.c,1.25,1.26 client.h,1.10,1.11
cras at procontrol.fi
cras at procontrol.fi
Thu Jan 9 01:55:46 EET 2003
Update of /home/cvs/dovecot/src/login
In directory danu:/tmp/cvs-serv10458
Modified Files:
client-authenticate.c client.c client.h
Log Message:
AUTHENTICATE command was broken.
Index: client-authenticate.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/client-authenticate.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- client-authenticate.c 7 Jan 2003 17:45:38 -0000 1.30
+++ client-authenticate.c 8 Jan 2003 23:55:44 -0000 1.31
@@ -251,6 +251,13 @@
if (!client_read(client))
return;
+ if (client->skip_line) {
+ if (i_stream_next_line(client->input) == NULL)
+ return;
+
+ client->skip_line = FALSE;
+ }
+
/* @UNSAFE */
line = i_stream_next_line(client->input);
if (line == NULL)
Index: client.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/client.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- client.c 7 Jan 2003 17:45:38 -0000 1.25
+++ client.c 8 Jan 2003 23:55:44 -0000 1.26
@@ -178,8 +178,11 @@
imap_parser_reset(client->parser);
/* remove \r\n */
- if (!client_skip_line(client))
- return;
+ if (client->skip_line) {
+ if (!client_skip_line(client))
+ return;
+ client->skip_line = FALSE;
+ }
client->cmd_finished = FALSE;
}
@@ -205,6 +208,7 @@
/* not enough data */
return;
}
+ client->skip_line = TRUE;
if (*client->cmd_tag == '\0' ||
!client_command_execute(client, client->cmd_name, args)) {
Index: client.h
===================================================================
RCS file: /home/cvs/dovecot/src/login/client.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- client.h 7 Jan 2003 17:45:38 -0000 1.10
+++ client.h 8 Jan 2003 23:55:44 -0000 1.11
@@ -22,6 +22,7 @@
unsigned int tls:1;
unsigned int cmd_finished:1;
+ unsigned int skip_line:1;
};
struct client *client_create(int fd, struct ip_addr *ip, int imaps);
More information about the dovecot-cvs
mailing list