diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-23 10:23:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-23 10:23:05 +0000 |
| commit | cb993b71672e8d5d7a680fe314f872b0f18c42b2 (patch) | |
| tree | d7ea0183701ff348ff4bff450e53532971cc970f /usr.sbin/config/pack.c | |
| parent | 694050c481daf67989ca298997667d593da700e4 (diff) | |
from netbsd; two devices instances which are otherwise the same but do
not attach via the same attributes are _not_ the same, and should not
be treated as aliases of each other.
Diffstat (limited to 'usr.sbin/config/pack.c')
| -rw-r--r-- | usr.sbin/config/pack.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c index c3378c0c8b1..46db9f4280b 100644 --- a/usr.sbin/config/pack.c +++ b/usr.sbin/config/pack.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pack.c,v 1.3 1996/04/21 23:40:21 deraadt Exp $ */ -/* $NetBSD: pack.c,v 1.3 1996/03/17 06:29:33 cgd Exp $ */ +/* $OpenBSD: pack.c,v 1.4 1996/06/23 10:23:04 deraadt Exp $ */ +/* $NetBSD: pack.c,v 1.3.4.1 1996/06/17 18:22:44 cgd Exp $ */ /* * Copyright (c) 1992, 1993 @@ -210,7 +210,8 @@ packdevi() /* * Return true if two aliases are "the same". In this case, they need - * to have the same config flags and the same locators. + * to attach via the same attribute, have the same config flags, and + * have the same locators. */ static int sameas(i1, i2) @@ -218,6 +219,8 @@ sameas(i1, i2) { register const char **p1, **p2; + if (i1->i_atattr != i2->i_atattr) + return (0); if (i1->i_cfflags != i2->i_cfflags) return (0); for (p1 = i1->i_locs, p2 = i2->i_locs; *p1 == *p2; p2++) |