From owner-freebsd-bugs Tue Aug 15 20: 7:54 2000 Delivered-To: freebsd-bugs@freebsd.org Received: from mailgw00.execpc.com (mailgw00.execpc.com [169.207.1.78]) by hub.freebsd.org (Postfix) with ESMTP id 57DAF37C037 for ; Tue, 15 Aug 2000 20:07:49 -0700 (PDT) (envelope-from hamilton@pobox.com) Received: from woodstock.monkey.net (d104.as14.nwbl0.wi.voyager.net [169.207.134.104]) by mailgw00.execpc.com (8.9.1) id WAA27415 for ; Tue, 15 Aug 2000 22:07:47 -0500 Received: from pobox.com (localhost [127.0.0.1]) by woodstock.monkey.net (Postfix) with ESMTP id 157431E2 for ; Tue, 15 Aug 2000 22:08:06 -0500 (CDT) X-Mailer: exmh version 2.1.1 10/16/1999 To: freebsd-bugs@freebsd.org Subject: pccardd logging NULL junk to syslog [patch] In-reply-to: Your message of "Wed, 16 Aug 2000 18:36:17 -0000." <20000816183617.D0C8437B5C0@hub.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 15 Aug 2000 22:08:06 -0500 From: Jon Hamilton Message-Id: <20000816030806.157431E2@woodstock.monkey.net> Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org I tried to send-pr this, but it bounced: } : unknown user: "freebsd-gnats-submit" Anyway, here is a patch which fixes some cosmetic problems with the logging done by pccardd. >Submitter-Id: current-users >Originator: Jon Hamilton >Organization: >Confidential: no >Synopsis: pccardd logging NULL junk to syslog [patch] >Severity: non-critical >Priority: low >Category: bin<[ advocacy | alpha | bin | conf | docs | gnu | i386 | ke rn | misc | ports | sparc ]> >Release: FreeBSD 4.1-STABLE i386 >Class: sw-bug >Environment: >Description: If a pccard does not have "additional info" in its CIS, pccardd will log a string to syslog containing NULLs. Additionally, it will log a message "No matching card for..." when in fact there is no card, and no message should be logged. Patch follows. >How-To-Repeat: Start pccardd with a card which has no info in its CIS for the additional info fields (e.g. newer versions of the Netgear FA-410TX). >Fix: Index: cardd.c =================================================================== RCS file: /export/freebsd-cvs/src/usr.sbin/pccard/pccardd/cardd.c,v retrieving revision 1.46.2.4 diff -u -r1.46.2.4 cardd.c --- cardd.c 2000/07/18 04:59:39 1.46.2.4 +++ cardd.c 2000/08/16 01:17:00 @@ -291,15 +291,16 @@ cis_strcmp(cp->add_info2, sp->cis->add_info2) != 0) { break; } logmsg("Card \"%s\"(\"%s\") " "[%s] [%s] " "matched \"%s\" (\"%s\") " "[%s] [%s] ", sp->cis->manuf, sp->cis->vers, - sp->cis->add_info1, sp->cis->add_info2, + sp->cis->add_info1 == NULL ? "" : sp->cis-> add_info1, + sp->cis->add_info2 == NULL ? "" : sp->cis-> add_info2, cp->manuf, cp->version, - cp->add_info1, cp->add_info2); + cp->add_info1 == NULL ? "" : cp->add_info1, + cp->add_info2 == NULL ? "" : cp->add_info2) ; goto escape; } break; @@ -325,8 +326,10 @@ reset_slot(sp); #endif if (cp == 0) { - logmsg("No card in database for \"%s\"(\"%s\")", - sp->cis->manuf, sp->cis->vers); + if(sp->cis->manuf != NULL){ + logmsg("No card in database for \"%s\"(\"%s\")", + sp->cis->manuf, sp->cis->vers); + } return; } if (sp->cis->lan_nid && sp->cis->lan_nid[0] == sizeof(sp->eaddr)) { -- Jon Hamilton hamilton@pobox.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message