44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
diff -up openssh-4.7p1/sshconnect2.c.cloexec openssh-4.7p1/sshconnect2.c
|
|
--- openssh-4.7p1/sshconnect2.c.cloexec 2008-03-06 15:58:03.000000000 +0100
|
|
+++ openssh-4.7p1/sshconnect2.c 2008-05-21 09:27:06.000000000 +0200
|
|
@@ -38,6 +38,7 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
+#include <fcntl.h>
|
|
|
|
#include "openbsd-compat/sys-queue.h"
|
|
|
|
@@ -1257,6 +1258,7 @@ ssh_keysign(Key *key, u_char **sigp, u_i
|
|
return -1;
|
|
}
|
|
if (pid == 0) {
|
|
+ fcntl(packet_get_connection_in(), F_SETFD, 0); /* keep the socket on exec */
|
|
permanently_drop_suid(getuid());
|
|
close(from[0]);
|
|
if (dup2(from[1], STDOUT_FILENO) < 0)
|
|
diff -up openssh-4.7p1/sshconnect.c.cloexec openssh-4.7p1/sshconnect.c
|
|
--- openssh-4.7p1/sshconnect.c.cloexec 2006-10-23 19:02:24.000000000 +0200
|
|
+++ openssh-4.7p1/sshconnect.c 2008-03-06 15:58:03.000000000 +0100
|
|
@@ -38,6 +38,7 @@
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
+#include <fcntl.h>
|
|
|
|
#include "xmalloc.h"
|
|
#include "key.h"
|
|
@@ -189,8 +190,11 @@ ssh_create_socket(int privileged, struct
|
|
return sock;
|
|
}
|
|
sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
|
|
- if (sock < 0)
|
|
+ if (sock < 0) {
|
|
error("socket: %.100s", strerror(errno));
|
|
+ return -1;
|
|
+ }
|
|
+ fcntl(sock, F_SETFD, FD_CLOEXEC);
|
|
|
|
/* Bind the socket to an alternative local IP address */
|
|
if (options.bind_address == NULL)
|