From 1b9fb7dde241a7eefd18793be8b89c40cb95fb13 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 18 Jul 2012 11:42:39 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index a5ff45bc..313f6050 100644 --- a/meta +++ b/meta @@ -1,9 +1,10 @@ Version: 1 -Previous: a528307349d536c2b6d7f14fb4a433e19f58145d -Head: c3882ddaea14673b5b3b3322459209c02f4083bf +Previous: 21b589aad2f0dd7d8a61f3557eecf28deac94a52 +Head: 089ce56b00315152514ce12d53465603d3dd2b42 Applied: transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6 fork: c3882ddaea14673b5b3b3322459209c02f4083bf + refresh-temp: 089ce56b00315152514ce12d53465603d3dd2b42 Unapplied: rstream-fork: ecd866920791883b70e9ed0f963bda63336664bc dbg: da928dc34f7529cc9ab73fc325d566d4152e4437 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..1b0f0c3c --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,33 @@ +Bottom: 7877a1a5ec8b625a7127ef30ba236e4677df5df2 +Top: c3cf2f5759614f2ebce8277cf3fac4f7c1643d05 +Author: Sean Hefty +Date: 2012-07-18 11:42:39 -0700 + +Refresh of fork + +--- + +diff --git a/src/preload.c b/src/preload.c +index a1073d5..5b6b50a 100644 +--- a/src/preload.c ++++ b/src/preload.c +@@ -468,8 +468,8 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl + long flags; + + fd = fd_getd(socket); +- flags = real.fcntl(fd, F_GETFD); +- real.fcntl(fd, F_SETFD, 0); ++ flags = real.fcntl(fd, F_GETFL); ++ real.fcntl(fd, F_SETFL, 0); + ret = real.connect(fd, addr, addrlen); + if (ret) + return ret; +@@ -480,7 +480,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl + return 0; + } + +- real.fcntl(fd, F_SETFD, flags); ++ real.fcntl(fd, F_SETFL, flags); + ret = transpose_socket(socket, fd_rsocket); + if (ret < 0) + return ret; -- 2.46.0