diff options
| author | perry <perry@NetBSD.org> | 2006-04-03 02:01:28 +0000 |
|---|---|---|
| committer | perry <perry@NetBSD.org> | 2006-04-03 02:01:28 +0000 |
| commit | eee85da04cbc41d01502bd32fa473f5d328a2ea0 (patch) | |
| tree | 9f42b8d2a899cc84448d8f7dfe8c90c5054dc5df /usr.bin/tip/cu.c | |
| parent | 896b79dbc83d48339904c4fec0700c1c76dcecfc (diff) | |
Remove support for uucp style locking.
This means we can get rid of the suid/sgid parts of the code (which
have been removed). The program is now installed with normal permissions.
To prevent accidents, we now flock the tty line, attempting to get an
exclusive lock.
Reviewed by: tls
Diffstat (limited to 'usr.bin/tip/cu.c')
| -rw-r--r-- | usr.bin/tip/cu.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c index 433a954ed64..51edae92e95 100644 --- a/usr.bin/tip/cu.c +++ b/usr.bin/tip/cu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cu.c,v 1.14 2006/04/03 01:48:22 tls Exp $ */ +/* $NetBSD: cu.c,v 1.15 2006/04/03 02:01:28 perry Exp $ */ /* * Copyright (c) 1983, 1993 @@ -36,7 +36,7 @@ #if 0 static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: cu.c,v 1.14 2006/04/03 01:48:22 tls Exp $"); +__RCSID("$NetBSD: cu.c,v 1.15 2006/04/03 02:01:28 perry Exp $"); #endif /* not lint */ #include "tip.h" @@ -203,15 +203,12 @@ cumain(int argc, char *argv[]) errx(3,"all ports busy"); } if (i == -1) { - warnx("link down"); - (void)uu_unlock(uucplock); - exit(3); + errx(3, "link down"); } setbuf(stdout, NULL); #ifdef ACULOG loginit(); #endif - user_uid(); vinit(); switch (parity) { case -1: @@ -255,24 +252,15 @@ cumain(int argc, char *argv[]) setboolean(value(LECHO), TRUE); if (HW) { if (ttysetup(BR) != 0) { - warnx("unsupported speed %ld", BR); - daemon_uid(); - (void)uu_unlock(uucplock); - exit(3); + errx(3, "unsupported speed %ld", BR); } } if (connect()) { - warnx("Connect failed"); - daemon_uid(); - (void)uu_unlock(uucplock); - exit(1); + errx(1, "Connect failed"); } if (!HW) { if (ttysetup(BR) != 0) { - warnx("unsupported speed %ld", BR); - daemon_uid(); - (void)uu_unlock(uucplock); - exit(3); + errx(3, "unsupported speed %ld", BR); } } } |
