From 59959c4215dc82f4ba48828e60efa0405ec4f9a9 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 17 May 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-05-17

---
 ip/ipifc.c  | 4 ++--
 ip/udp.c    | 3 ---
 pc/pci.c    | 2 +-
 port/auth.c | 6 +++++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ip/ipifc.c b/ip/ipifc.c
index a7e8767a7481e1a7427fc7c1b4a3a6fa307f5180..55d408e28ad91729f486bd79e5808cd5b6691d10 100644
--- a/ip/ipifc.c
+++ b/ip/ipifc.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
diff --git a/ip/udp.c b/ip/udp.c
index 4841c9714e1201325346b0287a19b6bdb5aff695..7ff5dc8e3efc2f8993cc8fa9d11e9a71721aab33 100644
--- a/ip/udp.c
+++ b/ip/udp.c
@@ -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);
diff --git a/pc/pci.c b/pc/pci.c
index 5ae68e6ba6e414ed64f2c3df2acb9940f1f098ac..e67eca9a657742aa2e76edb6bfdd5f1f8584770e 100644
--- a/pc/pci.c
+++ b/pc/pci.c
@@ -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];
diff --git a/port/auth.c b/port/auth.c
index bb1cf88d514ff3032ae036629712e31e175cd570..80a90ac487865b76ae1051aa8055557ce685ca39 100644
--- a/port/auth.c
+++ b/port/auth.c
@@ -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;