diff options
| author | mdodd <mdodd@FreeBSD.org> | 2003-06-22 05:57:34 +0000 |
|---|---|---|
| committer | mdodd <mdodd@FreeBSD.org> | 2003-06-22 05:57:34 +0000 |
| commit | 1bbe3348f5cde425db3250f766f205e872428e98 (patch) | |
| tree | a51497214177f198ebf11453d0a8c1156b6bf217 /usr.sbin | |
| parent | 5d0aaa2a8797f36a0400abe3aac546b308192bcf (diff) | |
| download | FreeBSD-src-1bbe3348f5cde425db3250f766f205e872428e98.zip FreeBSD-src-1bbe3348f5cde425db3250f766f205e872428e98.tar.gz | |
- Set close on exec flag for device file descriptors.
- Reset signal handlers in event_cmd_exec_act().
PR: i386/35182
Submitted by: Daniel O'Connor <darius@dons.net.au>
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/apmd/apmd.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c index 88e755c..79da664 100644 --- a/usr.sbin/apmd/apmd.c +++ b/usr.sbin/apmd/apmd.c @@ -120,6 +120,9 @@ event_cmd_exec_act(void *this) goto out; case 0: /* child process */ + signal(SIGHUP, SIG_DFL); + signal(SIGCHLD, SIG_DFL); + signal(SIGTERM, SIG_DFL); execl(_PATH_BSHELL, "sh", "-c", p->line, (char *)NULL); _exit(127); default: @@ -691,10 +694,18 @@ main(int ac, char* av[]) (void) err(1, "cannot open device file `%s'", APM_NORM_DEVICEFILE); } + if (fcntl(apmnorm_fd, F_SETFD, 1) == -1) { + (void) err(1, "cannot set close-on-exec flag for device file '%s'", APM_NORM_DEVICEFILE); + } + if ((apmctl_fd = open(APM_CTL_DEVICEFILE, O_RDWR)) == -1) { (void) err(1, "cannot open device file `%s'", APM_CTL_DEVICEFILE); } + if (fcntl(apmctl_fd, F_SETFD, 1) == -1) { + (void) err(1, "cannot set close-on-exec flag for device file '%s'", APM_CTL_DEVICEFILE); + } + restart(); write_pid(); event_loop(); |
