diff options
| -rw-r--r-- | usr.sbin/smtpd/control.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mda.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mfa.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mta.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/queue.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/scheduler.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtp.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 4 |
9 files changed, 9 insertions, 19 deletions
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c index 8312bad41ca..5006f50c6c3 100644 --- a/usr.sbin/smtpd/control.c +++ b/usr.sbin/smtpd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.85 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: control.c,v 1.86 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2012 Gilles Chehade <gilles@poolp.org> @@ -181,7 +181,6 @@ control(void) case -1: fatal("control: cannot fork"); case 0: - env->sc_pid = getpid(); break; default: return (pid); diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index 62494e3c0a7..9c76bacffcc 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.152 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: lka.c,v 1.153 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -582,7 +582,6 @@ lka(void) case -1: fatal("lka: cannot fork"); case 0: - env->sc_pid = getpid(); break; default: return (pid); diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c index f5a8fefbde9..9a6b74551ca 100644 --- a/usr.sbin/smtpd/mda.c +++ b/usr.sbin/smtpd/mda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mda.c,v 1.91 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: mda.c,v 1.92 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -500,7 +500,6 @@ mda(void) case -1: fatal("mda: cannot fork"); case 0: - env->sc_pid = getpid(); break; default: return (pid); diff --git a/usr.sbin/smtpd/mfa.c b/usr.sbin/smtpd/mfa.c index c27b485937e..2e2e4e53ef2 100644 --- a/usr.sbin/smtpd/mfa.c +++ b/usr.sbin/smtpd/mfa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfa.c,v 1.76 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: mfa.c,v 1.77 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -220,7 +220,6 @@ mfa(void) case -1: fatal("mfa: cannot fork"); case 0: - env->sc_pid = getpid(); break; default: return (pid); diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c index 825afa1fcd8..e8f74b0463e 100644 --- a/usr.sbin/smtpd/mta.c +++ b/usr.sbin/smtpd/mta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta.c,v 1.159 2013/06/04 08:16:10 eric Exp $ */ +/* $OpenBSD: mta.c,v 1.160 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -423,7 +423,6 @@ mta(void) case -1: fatal("mta: cannot fork"); case 0: - env->sc_pid = getpid(); break; default: return (pid); diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c index e2517fdac2a..6bebc5d7340 100644 --- a/usr.sbin/smtpd/queue.c +++ b/usr.sbin/smtpd/queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.c,v 1.148 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: queue.c,v 1.149 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -534,7 +534,6 @@ queue(void) case -1: fatal("queue: cannot fork"); case 0: - env->sc_pid = getpid(); break; default: return (pid); diff --git a/usr.sbin/smtpd/scheduler.c b/usr.sbin/smtpd/scheduler.c index 6c2d8da476f..1c09faf562e 100644 --- a/usr.sbin/smtpd/scheduler.c +++ b/usr.sbin/smtpd/scheduler.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scheduler.c,v 1.28 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: scheduler.c,v 1.29 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -330,7 +330,6 @@ scheduler(void) case -1: fatal("scheduler: cannot fork"); case 0: - env->sc_pid = getpid(); break; default: return (pid); diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c index 92d0c553d36..7b64c21d101 100644 --- a/usr.sbin/smtpd/smtp.c +++ b/usr.sbin/smtpd/smtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp.c,v 1.125 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: smtp.c,v 1.126 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -240,7 +240,6 @@ smtp(void) case -1: fatal("smtp: cannot fork"); case 0: - env->sc_pid = getpid(); break; default: return (pid); diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 8999fc093d8..10afc9a3e27 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.412 2013/07/19 07:37:29 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.413 2013/07/19 07:49:08 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -530,8 +530,6 @@ struct smtpd { char sc_conffile[SMTPD_MAXPATHLEN]; size_t sc_maxsize; - pid_t sc_pid; - #define SMTPD_OPT_VERBOSE 0x00000001 #define SMTPD_OPT_NOACTION 0x00000002 uint32_t sc_opts; |