diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2006-06-14 16:23:02 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2006-06-14 16:23:02 +0000 |
| commit | 519bd6b141ceebfd6ecf5d83fc6982ba2400d1f6 (patch) | |
| tree | cc2608de04a102294610c8979b33e4638632f673 /contrib/sendmail/src/main.c | |
| parent | b692e05a4491e02dd89c68fae75d1bff801b74ee (diff) | |
| parent | 1024e3943e17bd4407f0cf3a799cfa05d59f1059 (diff) | |
| download | FreeBSD-src-519bd6b141ceebfd6ecf5d83fc6982ba2400d1f6.zip FreeBSD-src-519bd6b141ceebfd6ecf5d83fc6982ba2400d1f6.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r159609,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/sendmail/src/main.c')
| -rw-r--r-- | contrib/sendmail/src/main.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/contrib/sendmail/src/main.c b/contrib/sendmail/src/main.c index 45ea1ed..d81d386 100644 --- a/contrib/sendmail/src/main.c +++ b/contrib/sendmail/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2006 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -25,7 +25,7 @@ SM_UNUSED(static char copyright[]) = The Regents of the University of California. All rights reserved.\n"; #endif /* ! lint */ -SM_RCSID("@(#)$Id: main.c,v 8.942 2005/12/26 04:39:13 ca Exp $") +SM_RCSID("@(#)$Id: main.c,v 8.944 2006/04/21 23:56:42 ca Exp $") #if NETINET || NETINET6 @@ -516,6 +516,8 @@ main(argc, argv, envp) /* reset macro */ set_op_mode(OpMode); + if (OpMode == MD_DAEMON) + DaemonPid = CurrentPid; /* needed for finis() to work */ pw = sm_getpwuid(RealUid); if (pw != NULL) @@ -2319,10 +2321,7 @@ main(argc, argv, envp) dtype[0] = '\0'; if (OpMode == MD_DAEMON) - { (void) sm_strlcat(dtype, "+SMTP", sizeof dtype); - DaemonPid = CurrentPid; - } if (QueueIntvl > 0) { (void) sm_strlcat2(dtype, @@ -2874,6 +2873,7 @@ finis(drop, cleanup, exitstat) volatile int exitstat; { char pidpath[MAXPATHLEN]; + pid_t pid; /* Still want to process new timeouts added below */ sm_clear_events(); @@ -2942,14 +2942,15 @@ finis(drop, cleanup, exitstat) /* XXX clean up queues and related data structures */ cleanup_queues(); + pid = getpid(); #if SM_CONF_SHM - cleanup_shm(DaemonPid == getpid()); + cleanup_shm(DaemonPid == pid); #endif /* SM_CONF_SHM */ /* close locked pid file */ close_sendmail_pid(); - if (DaemonPid == getpid() || PidFilePid == getpid()) + if (DaemonPid == pid || PidFilePid == pid) { /* blow away the pid file */ expand(PidFile, pidpath, sizeof pidpath, CurEnv); @@ -3275,13 +3276,18 @@ disconnect(droplev, e) { fd = open(SM_PATH_DEVNULL, O_WRONLY, 0666); if (fd == -1) + { sm_syslog(LOG_ERR, e->e_id, "disconnect: open(\"%s\") failed: %s", SM_PATH_DEVNULL, sm_errstring(errno)); + } (void) sm_io_flush(smioout, SM_TIME_DEFAULT); - (void) dup2(fd, STDOUT_FILENO); - (void) dup2(fd, STDERR_FILENO); - (void) close(fd); + if (fd >= 0) + { + (void) dup2(fd, STDOUT_FILENO); + (void) dup2(fd, STDERR_FILENO); + (void) close(fd); + } } /* drop our controlling TTY completely if possible */ |
