From 50b5ec4154e7deff62c82d0f8e000352afc6e1fc Mon Sep 17 00:00:00 2001 From: Nate Williams Date: Mon, 8 Dec 1997 06:35:07 +0000 Subject: - Changed strcmp to strncmp for checking the CIS manufacturer strings, since we only store CIS_MAXSTR data, and the users may stick the 'entire' CIS string returned from the card in /etc/pccard.conf and cause the comparison to (bogusly) fail. Submitted by: Brad Karp --- usr.sbin/pccard/pccardd/cardd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/pccard/pccardd/cardd.c b/usr.sbin/pccard/pccardd/cardd.c index 4b392a5537b5..a631615d399d 100644 --- a/usr.sbin/pccard/pccardd/cardd.c +++ b/usr.sbin/pccard/pccardd/cardd.c @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "$Id: cardd.c,v 1.21 1997/11/19 02:31:37 nate Exp $"; + "$Id: cardd.c,v 1.22 1997/11/25 19:15:59 nate Exp $"; #endif /* not lint */ #include @@ -288,8 +288,8 @@ card_inserted(struct slot *sp) dumpcis(sp->cis); #endif for (cp = cards; cp; cp = cp->next) - if (strcmp(cp->manuf, sp->cis->manuf) == 0 && - strcmp(cp->version, sp->cis->vers) == 0) + if (strncmp(cp->manuf, sp->cis->manuf, CIS_MAXSTR) == 0 && + strncmp(cp->version, sp->cis->vers, CIS_MAXSTR) == 0) break; sp->card = cp; #if 0 -- cgit v1.3