diff options
| author |   millert <millert@openbsd.org> | 2020-02-07 02:27:37 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2020-02-07 02:27:37 +0000 |
| commit | 8bc1a32387697149fd2d2ddb968ce26852d462b6 (patch) | |
| tree | d0b3f2dca7a0976e22f4233a883e7bd167d5b90c /libexec | |
| parent | update to upstream libfido2 780ad3c25 (20120123) (diff) | |
| download | wireguard-openbsd-8bc1a32387697149fd2d2ddb968ce26852d462b6.tar.xz wireguard-openbsd-8bc1a32387697149fd2d2ddb968ce26852d462b6.zip | |
Remove backward compatibility for obsolete -H flag.
The -H flag was deprecated in 1998. OK jung@
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/mail.local/mail.local.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c index 635b2558ee5..370e6f600a9 100644 --- a/libexec/mail.local/mail.local.c +++ b/libexec/mail.local/mail.local.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mail.local.c,v 1.37 2020/02/02 23:17:09 millert Exp $ */ +/* $OpenBSD: mail.local.c,v 1.38 2020/02/07 02:27:37 millert Exp $ */ /*- * Copyright (c) 1996-1998 Theo de Raadt <deraadt@theos.com> @@ -55,14 +55,14 @@ int main(int argc, char *argv[]) { struct passwd *pw; - int ch, fd, eval, lockfile=1, holdme=0; + int ch, fd, eval, lockfile=1; uid_t uid; char *from; openlog("mail.local", LOG_PERROR, LOG_MAIL); from = NULL; - while ((ch = getopt(argc, argv, "lLdf:r:H")) != -1) + while ((ch = getopt(argc, argv, "lLdf:r:")) != -1) switch (ch) { case 'd': /* backward compatible */ break; @@ -78,23 +78,14 @@ main(int argc, char *argv[]) case 'L': lockfile=0; break; - case 'H': - holdme=1; - break; default: usage(); } argc -= optind; argv += optind; - /* Support -H flag for backwards compat */ - if (holdme) { - execl(_PATH_LOCKSPOOL, "lockspool", (char *)NULL); - merr(FATAL, "execl: lockspool: %s", strerror(errno)); - } else { - if (!*argv) - usage(); - } + if (!*argv) + usage(); /* * If from not specified, use the name from getlogin() if the |