4 files changed, 8 insertions(+), 7 deletions(-)

M ip/ipifc.c
M ip/udp.c
M pc/pci.c
M port/auth.c

@@ 213,9 213,9 @@ ipifcunbind(Ipifc *ifc)
 
 
 
-char *sfixedformat = "device %-12s maxmtu %-5d sendra %-1d recvra %-1d mflag %-1d oflag %-1d maxraint %-10d minraint %-10d linkmtu %-10d reachtime %-10d rxmitra %-10d ttl %-10d routerlt %-10d pktin %-7lud pktout %-7lud errin %-7lud errout %-7lud\n";
+char sfixedformat[] = "device %s maxmtu %d sendra %d recvra %d mflag %d oflag %d maxraint %d minraint %d linkmtu %d reachtime %d rxmitra %d ttl %d routerlt %d pktin %lud pktout %lud errin %lud errout %lud\n";
 
-char *slineformat = "	%-40.40I %-10.10M %-40.40I %-12lud %-12lud\n";
+char slineformat[] = "	%-40.40I %-10.10M %-40.40I %-12lud %-12lud\n";
 
 
 static int

@@ 558,8 558,6 @@ udpadvise(Proto *udp, Block *bp, char *msg)
 		pdest = nhgets(h6->udpdport);
 	}
 
-print("udpadvise: looking for s %I sp %d d %I dp %d\n", source, (int)psource, dest, (int)pdest);
-
 	/* Look for a connection */
 	qlock(udp);
 	for(p = udp->conv; *p; p++) {


@@ 570,7 568,6 @@ print("udpadvise: looking for s %I sp %d d %I dp %d\n", source, (int)psource, de
 		if(ipcmp(s->laddr, source) == 0){
 			qlock(s);
 			qunlock(udp);
-print("udpadvise: found, hanging up\n");
 			qhangup(s->rq, msg);
 			qhangup(s->wq, msg);
 			qunlock(s);

@@ 696,7 696,7 @@ pcirouting(void)
 			break;
 
 	if(i == nelem(southbridges)) {
-		print("pcirouting: south bridge %.4uX/%.4uX (unknown type)\n", sbpci->vid, sbpci->did);
+		print("pcirouting: ignoring south bridge %T %.4uX/%.4uX\n", tbdf, sbpci->vid, sbpci->did);
 		return;
 	}
 	southbridge = &southbridges[i];

@@ 75,6 75,11 @@ sysfauth(ulong *arg)
 	}
 
 	ac = mntauth(c, aname);
+
+	/* at this point ac is responsible for keeping c alive */
+	cclose(c);
+	poperror();	/* c */
+
 	if(waserror()){
 		cclose(ac);
 		nexterror();


@@ 84,7 89,6 @@ sysfauth(ulong *arg)
 	if(fd < 0)
 		error(Enofd);
 	poperror();	/* ac */
-	poperror();	/* c */
 
 	/* always mark it close on exec */
 	ac->flag |= CCEXEC;