diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-11-10 08:08:23 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-11-10 08:08:23 -0500 |
| commit | 11ec76edb225c0f0e6a57b1d667179b14aa2ac20 (patch) | |
| tree | 731f3692764c8e5f68c75ab55cda5fbb1d37edff /lib/pid_output.c | |
| parent | 82b4d5da4be55ffc3ffd6b0d74de99d184a23b87 (diff) | |
| parent | 9f1f8df328271d3cd47a28c74efaeeefabc680ec (diff) | |
Merge remote-tracking branch 'opensourcerouting/cmaster-next-vty2' into cmaster-next
Conflicts:
watchquagga/watchquagga.c
Diffstat (limited to 'lib/pid_output.c')
| -rw-r--r-- | lib/pid_output.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pid_output.c b/lib/pid_output.c index 5261babc6d..de4c2fba99 100644 --- a/lib/pid_output.c +++ b/lib/pid_output.c @@ -24,6 +24,7 @@ #include <fcntl.h> #include <log.h> #include "version.h" +#include "network.h" #define PIDFILE_MASK 0644 #ifndef HAVE_FCNTL @@ -84,6 +85,8 @@ pid_output (const char *path) umask(oldumask); memset (&lock, 0, sizeof(lock)); + set_cloexec(fd); + lock.l_type = F_WRLCK; lock.l_whence = SEEK_SET; |