diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-11-12 05:17:37 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-11-12 05:17:37 +0000 |
| commit | 07321a065d1126c00766ca3d6698e57936699f82 (patch) | |
| tree | a7dac2bb2248d87f40b1c3c2af7440d9bea35421 /lib/pid_output.c | |
| parent | 17aca20bfbb9d7e980a04c9b017f87f027901839 (diff) | |
| parent | 11ec76edb225c0f0e6a57b1d667179b14aa2ac20 (diff) | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
lib/command.c
lib/vty.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; |