{"thread":{"id":"6822","subject":"[PATCH] git-daemon: Avoid leaking the listening sockets into child processes.","startedAt":"2007-02-14T17:10:26Z","lastAt":"2007-02-14T17:10:26Z","messageCount":1,"participants":["Alexandre Julliard"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"34570","messageId":"87d54c8y2l.fsf@wine.dyndns.org","threadId":"6822","inReplyTo":null,"subject":"[PATCH] git-daemon: Avoid leaking the listening sockets into child processes.","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2007-02-14T17:10:26Z","receivedAt":"2007-02-14T17:10:26Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"This makes it possible to restart git-daemon even if some children are\nstill running.\n\nSigned-off-by: Alexandre Julliard <julliard@winehq.org>\n---\n daemon.c |   10 ++++++++++\n 1 files changed, 10 insertions(+), 0 deletions(-)\n\ndiff --git a/daemon.c b/daemon.c\nindex 2a20ca5..66f8d6f 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -773,6 +773,7 @@ static int socksetup(char *listen_addr, int listen_port, int **socklist_p)\n \tchar pbuf[NI_MAXSERV];\n \tstruct addrinfo hints, *ai0, *ai;\n \tint gai;\n+\tlong flags;\n \n \tsprintf(pbuf, \"%d\", listen_port);\n \tmemset(&hints, 0, sizeof(hints));\n@@ -820,6 +821,10 @@ static int socksetup(char *listen_addr, int listen_port, int **socklist_p)\n \t\t\tcontinue;\t/* not fatal */\n \t\t}\n \n+\t\tflags = fcntl(sockfd, F_GETFD, 0);\n+\t\tif (flags >= 0)\n+\t\t\tfcntl(sockfd, F_SETFD, flags | FD_CLOEXEC);\n+\n \t\tsocklist = xrealloc(socklist, sizeof(int) * (socknum + 1));\n \t\tsocklist[socknum++] = sockfd;\n \n@@ -839,6 +844,7 @@ static int socksetup(char *listen_addr, int listen_port, int **socklist_p)\n {\n \tstruct sockaddr_in sin;\n \tint sockfd;\n+\tlong flags;\n \n \tmemset(&sin, 0, sizeof sin);\n \tsin.sin_family = AF_INET;\n@@ -871,6 +877,10 @@ static int socksetup(char *listen_addr, int listen_port, int **socklist_p)\n \t\treturn 0;\n \t}\n \n+\tflags = fcntl(sockfd, F_GETFD, 0);\n+\tif (flags >= 0)\n+\t\tfcntl(sockfd, F_SETFD, flags | FD_CLOEXEC);\n+\n \t*socklist_p = xmalloc(sizeof(int));\n \t**socklist_p = sockfd;\n \treturn 1;\n-- \n1.5.0.7.g2fa71\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"}]}