diff options
| author | peter <peter@FreeBSD.org> | 1995-08-17 04:57:21 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1995-08-17 04:57:21 +0000 |
| commit | f2c21db1649c3858bf0d3d1775e0462f923dd982 (patch) | |
| tree | ba18adf02650ad8839f385b7f27f91ea42b1c1b9 /usr.sbin/sendmail/src/readcf.c | |
| parent | a9bf7387cf18bf6618c70967ca793ccfc13103f2 (diff) | |
| download | FreeBSD-src-f2c21db1649c3858bf0d3d1775e0462f923dd982.zip FreeBSD-src-f2c21db1649c3858bf0d3d1775e0462f923dd982.tar.gz | |
Merge in the remaining differences from 8.6.11 to 8.6.12.
Note that conf.c, although there was an import conflict, it did not
require intervention, as it was the $Id$ tag. It would have become
rev 1.8 on checkout so there's no point changing it from 1.7 to
1.1.1.3 as the "-j" option wanted to do.. Trust me.. :-)
Diffstat (limited to 'usr.sbin/sendmail/src/readcf.c')
| -rw-r--r-- | usr.sbin/sendmail/src/readcf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/sendmail/src/readcf.c b/usr.sbin/sendmail/src/readcf.c index a2d37d9..4a2a820 100644 --- a/usr.sbin/sendmail/src/readcf.c +++ b/usr.sbin/sendmail/src/readcf.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)readcf.c 8.23.1.2 (Berkeley) 2/10/95"; +static char sccsid[] = "@(#)readcf.c 8.23.1.3 (Berkeley) 3/5/95"; #endif /* not lint */ # include "sendmail.h" @@ -1354,6 +1354,7 @@ setoption(opt, val, safe, sticky, e) syserr("readcf: Op line: %s unrecognized", val); PrivacyFlags |= pv->pv_flag; } + sticky = FALSE; break; case 'P': /* postmaster copy address for returned mail */ |
