[dovecot-cvs] dovecot/src/login-common login-proxy.c, 1.8, 1.9 master.c, 1.17, 1.18

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/login-common
In directory talvi:/tmp/cvs-serv5842/login-common

Modified Files:
	login-proxy.c master.c 
Log Message:
Added i_stream_destroy() and o_stream_destroy() and used them instead of
*_stream_unref() where possible. Fixes at least one problem with io_remove()
being called after socket was closed, which caused problems with epoll.



Index: login-proxy.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/login-proxy.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- login-proxy.c	20 Feb 2006 17:17:15 -0000	1.8
+++ login-proxy.c	26 Feb 2006 10:05:23 -0000	1.9
@@ -201,7 +201,7 @@
 		if (proxy->client_io != NULL)
 			io_remove(&proxy->client_io);
 		if (proxy->client_output != NULL)
-			o_stream_unref(&proxy->client_output);
+			o_stream_destroy(&proxy->client_output);
 		net_disconnect(proxy->client_fd);
 	} else {
 		proxy->destroying = TRUE;
@@ -211,9 +211,9 @@
 	if (proxy->server_io != NULL)
 		io_remove(&proxy->server_io);
 	if (proxy->server_input != NULL)
-		i_stream_unref(&proxy->server_input);
+		i_stream_destroy(&proxy->server_input);
 	if (proxy->server_output != NULL)
-		o_stream_unref(&proxy->server_output);
+		o_stream_destroy(&proxy->server_output);
 	net_disconnect(proxy->server_fd);
 
 	i_free(proxy->host);

Index: master.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/master.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- master.c	29 Jan 2006 12:14:49 -0000	1.17
+++ master.c	26 Feb 2006 10:05:23 -0000	1.18
@@ -151,7 +151,7 @@
 			env_put(line);
 	} while (line == NULL);
 
-	i_stream_unref(&input);
+	i_stream_destroy(&input);
 }
 
 int master_connect(const char *group_name)