diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2001-11-29 14:33:57 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2001-11-29 14:33:57 +0000 |
| commit | 844abb905ae6490291022ed37ed5a38dd963c8f9 (patch) | |
| tree | 66cde9a081fac59b9793d66a9e3777e592753632 /usr.sbin/pccard/pccardd | |
| parent | 73fc132b6c55bf3a46d4ebffee097c8c3d5c1332 (diff) | |
| download | FreeBSD-src-844abb905ae6490291022ed37ed5a38dd963c8f9.zip FreeBSD-src-844abb905ae6490291022ed37ed5a38dd963c8f9.tar.gz | |
Fix a bug about CIS string comparison. Pccardd should be able to distinguish
card "MELCO" "LPC2-T"
and
card "MELCO" "LPC2-TX"
by this fix.
Reported by: Kitagawa Shoichi <sk@xstar.kiu.ac.jp>,
NINOMIYA Hideyuki <nin@shikoku.ne.jp>
MFC after: 1 week
Diffstat (limited to 'usr.sbin/pccard/pccardd')
| -rw-r--r-- | usr.sbin/pccard/pccardd/cardd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr.sbin/pccard/pccardd/cardd.c b/usr.sbin/pccard/pccardd/cardd.c index 9c8dff1..b2ca965 100644 --- a/usr.sbin/pccard/pccardd/cardd.c +++ b/usr.sbin/pccard/pccardd/cardd.c @@ -246,6 +246,10 @@ cis_strcmp(char *db, char *cis) db++; } else { /* otherwise, matching by strncmp() */ + if (n != strlen(cis)) { + return -1; + } + return strncmp(db, cis, n); } p = xmalloc(n); |
