[dovecot-cvs] dovecot/src/imap-login client.c, 1.34, 1.35 client.h, 1.13, 1.14 imap-proxy.c, 1.3, 1.4

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap-login
In directory talvi:/tmp/cvs-serv1443

Modified Files:
	client.c client.h imap-proxy.c 
Log Message:
Fixes.



Index: client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap-login/client.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- client.c	19 Oct 2004 15:47:45 -0000	1.34
+++ client.c	20 Oct 2004 14:02:12 -0000	1.35
@@ -73,7 +73,7 @@
 
 /* Skip incoming data until newline is found,
    returns TRUE if newline was found. */
-static int client_skip_line(struct imap_client *client)
+int client_skip_line(struct imap_client *client)
 {
 	const unsigned char *data;
 	size_t i, data_size;

Index: client.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap-login/client.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- client.h	18 Oct 2004 23:07:01 -0000	1.13
+++ client.h	20 Oct 2004 14:02:12 -0000	1.14
@@ -37,6 +37,7 @@
 void client_send_tagline(struct imap_client *client, const char *line);
 
 int client_read(struct imap_client *client);
+int client_skip_line(struct imap_client *client);
 void client_input(void *context);
 
 void client_ref(struct imap_client *client);

Index: imap-proxy.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap-login/imap-proxy.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imap-proxy.c	20 Oct 2004 13:59:33 -0000	1.3
+++ imap-proxy.c	20 Oct 2004 14:02:12 -0000	1.4
@@ -44,9 +44,10 @@
 	} else if (strncmp(line, "P OK ", 5) == 0) {
 		/* Login successful. Send this line to client. */
 		(void)o_stream_send_str(client->output, client->cmd_tag);
-		(void)o_stream_send_str(client->output, line + 2);
+		(void)o_stream_send_str(client->output, line + 1);
 		(void)o_stream_send(client->output, "\r\n", 2);
 
+		(void)client_skip_line(client);
 		login_proxy_detach(client->proxy, client->input,
 				   client->output);