diff options
| author |   krw <krw@openbsd.org> | 2011-04-24 01:13:55 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2011-04-24 01:13:55 +0000 |
| commit | f2875fa7d5b6bf8abdbe65c86f8ca547abfd7fd0 (patch) | |
| tree | 1febab9a06a19b22e0b42671535b8d4de0e942ea | |
| parent | fenv for i386, and sparc64; from matthew@ (diff) | |
| download | wireguard-openbsd-f2875fa7d5b6bf8abdbe65c86f8ca547abfd7fd0.tar.xz wireguard-openbsd-f2875fa7d5b6bf8abdbe65c86f8ca547abfd7fd0.zip | |
No point in attempting to open the 'c' partition on devices that have
no 'c' partition. So don't call opendev(3) with OPENDEV_PART.
ok deraadt@
| -rw-r--r-- | bin/chio/chio.c | 4 | ||||
| -rw-r--r-- | bin/mt/mt.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/chio/chio.c b/bin/chio/chio.c index 6e28985f511..b3d72fb8dd6 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chio.c,v 1.22 2007/11/27 16:22:12 martynas Exp $ */ +/* $OpenBSD: chio.c,v 1.23 2011/04/24 01:13:55 krw Exp $ */ /* $NetBSD: chio.c,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $ */ /* @@ -670,7 +670,7 @@ check_source_drive(int unit) * Try to make it accessible by doing an mt offline. */ tapedev = parse_tapedev(_PATH_CH_CONF, changer_name, unit); - mtfd = opendev(tapedev, O_RDONLY, OPENDEV_PART, NULL); + mtfd = opendev(tapedev, O_RDONLY, 0, NULL); if (mtfd == -1) err(1, "%s drive %d (%s): open", changer_name, unit, tapedev); if (ioctl(mtfd, MTIOCTOP, &mtoffl) == -1) diff --git a/bin/mt/mt.c b/bin/mt/mt.c index 0c1d6e9bd0d..e3733073202 100644 --- a/bin/mt/mt.c +++ b/bin/mt/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.33 2009/11/09 06:42:59 deraadt Exp $ */ +/* $OpenBSD: mt.c,v 1.34 2011/04/24 01:13:55 krw Exp $ */ /* $NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $ */ /* @@ -211,7 +211,7 @@ main(int argc, char *argv[]) } flags = comp->c_ronly ? O_RDONLY : O_WRONLY | O_CREAT; - if ((mtfd = _rmtopendev(tape, flags, OPENDEV_PART, &realtape)) < 0) { + if ((mtfd = _rmtopendev(tape, flags, 0, &realtape)) < 0) { if (errno != 0) warn("%s", host ? tape : realtape); exit(2); |