pidgin: 3c5570eb: These fds don't need to be inherited by ...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 3c5570eb19f5f8128c41aec6053f2c89130bfb5f
Ancestor: 3d639e6a8cacd7ad8179a443463a072ded0cbf3c
Author: datallah at pidgin.im
Date: 2008-08-12T23:03:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3c5570eb19f5f8128c41aec6053f2c89130bfb5f

Modified files:
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c

ChangeLog: 

These fds don't need to be inherited by child processes.

-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/bonjour_ft.c	8e1d6d186c47acd0e97dde10d8428d53a87f77fc
+++ libpurple/protocols/bonjour/bonjour_ft.c	655f82b2b35b210d3fce3d3675088eaeb79e3a1f
@@ -633,6 +633,9 @@ bonjour_sock5_request_cb(gpointer data, 
 
 			flags = fcntl(acceptfd, F_GETFL);
 			fcntl(acceptfd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+			fcntl(acceptfd, F_SETFD, FD_CLOEXEC);
+#endif
 
 			purple_input_remove(xfer->watcher);
 			close(source);
============================================================
--- libpurple/protocols/bonjour/jabber.c	abd2623f212047905d1ecb03506b9ed82eb1de5f
+++ libpurple/protocols/bonjour/jabber.c	1f2ed46583c6d3fa13de13dd6cd1741f36744508
@@ -637,6 +637,9 @@ _server_socket_handler(gpointer data, in
 
 	flags = fcntl(client_socket, F_GETFL);
 	fcntl(client_socket, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(client_socket, F_SETFD, FD_CLOEXEC);
+#endif
 
 	/* Look for the buddy that has opened the conversation and fill information */
 	address_text = inet_ntoa(their_addr.sin_addr);