summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2001-09-04 22:19:23 +0000
committermillert <millert@openbsd.org>2001-09-04 22:19:23 +0000
commite12cae2f917900790ed28beb3984c98a4e568ed0 (patch)
tree64b4bb79ca1b5a75675807b8f562c213d72bdb4b
parentput changes back, this time ALL the files. (diff)
downloadwireguard-openbsd-e12cae2f917900790ed28beb3984c98a4e568ed0.tar.xz
wireguard-openbsd-e12cae2f917900790ed28beb3984c98a4e568ed0.zip
Use merr() not err() since due to function name change in mail.local/locking.c
-rw-r--r--libexec/lockspool/lockspool.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/lockspool/lockspool.c b/libexec/lockspool/lockspool.c
index 38bfbdfde80..3ff3a995744 100644
--- a/libexec/lockspool/lockspool.c
+++ b/libexec/lockspool/lockspool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lockspool.c,v 1.4 2001/08/18 21:37:38 deraadt Exp $ */
+/* $OpenBSD: lockspool.c,v 1.5 2001/09/04 22:19:23 millert Exp $ */
/*
* Copyright (c) 1998 Theo de Raadt <deraadt@theos.com>
@@ -29,7 +29,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: lockspool.c,v 1.4 2001/08/18 21:37:38 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.5 2001/09/04 22:19:23 millert Exp $";
#endif /* not lint */
#include <sys/signal.h>
@@ -59,7 +59,7 @@ main(argc, argv)
if (argc != 1 && argc != 2)
usage();
if (argc == 2 && getuid() != 0)
- err(1, "you must be root to lock someone else's spool");
+ merr(FATAL, "you must be root to lock someone else's spool");
signal(SIGTERM, unhold);
signal(SIGINT, unhold);
@@ -108,5 +108,5 @@ void
usage()
{
- err(1, "usage: %s [username]", __progname);
+ merr(FATAL, "usage: %s [username]", __progname);
}