Browse Source

Plan 9 from Bell Labs 2008-02-23

David du Colombier 12 years ago
parent
commit
5f9148cf04
6 changed files with 56 additions and 34 deletions
  1. 16 16
      dist/replica/_plan9.db
  2. 16 16
      dist/replica/plan9.db
  3. 16 0
      dist/replica/plan9.log
  4. 5 1
      rc/bin/iwhois
  5. 1 1
      sys/man/2/ip
  6. 2 0
      sys/src/libauthsrv/readnvram.c

+ 16 - 16
dist/replica/_plan9.db

@@ -42,20 +42,20 @@
 386/bin/ascii - 775 sys sys 1168402265 64884
 386/bin/astro - 775 sys sys 1178568245 137403
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1188702764 140221
+386/bin/auth/aescbc - 775 sys sys 1203712992 140285
 386/bin/auth/asn12rsa - 775 sys sys 1188446816 121912
 386/bin/auth/authsrv - 775 sys sys 1201753318 165370
 386/bin/auth/changeuser - 775 sys sys 1178568246 96020
-386/bin/auth/convkeys - 775 sys sys 1188446822 87298
-386/bin/auth/convkeys2 - 775 sys sys 1188446825 87357
+386/bin/auth/convkeys - 775 sys sys 1203712993 87362
+386/bin/auth/convkeys2 - 775 sys sys 1203712994 87421
 386/bin/auth/cron - 775 sys sys 1188446828 140446
 386/bin/auth/debug - 775 sys sys 1192762780 102504
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1200717245 321923
+386/bin/auth/factotum - 775 sys sys 1203712996 321987
 386/bin/auth/fgui - 775 sys sys 1197732639 219095
 386/bin/auth/guard.srv - 775 sys sys 1201753321 144750
-386/bin/auth/keyfs - 775 sys sys 1191035876 116576
+386/bin/auth/keyfs - 775 sys sys 1203712999 116640
 386/bin/auth/login - 775 sys sys 1196742440 104821
 386/bin/auth/newns - 775 sys sys 1179372070 90035
 386/bin/auth/none - 775 sys sys 1179432184 89808
@@ -69,13 +69,13 @@
 386/bin/auth/rsafill - 775 sys sys 1168402273 143968
 386/bin/auth/rsagen - 775 sys sys 1178568249 151953
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1188702769 192724
+386/bin/auth/secstore - 775 sys sys 1203713003 192796
 386/bin/auth/secstored - 775 sys sys 1201753324 197600
 386/bin/auth/secuser - 775 sys sys 1188702776 149443
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1168402275 63314
 386/bin/auth/warning - 775 sys sys 1179372071 99970
-386/bin/auth/wrkey - 775 sys sys 1188446872 76288
+386/bin/auth/wrkey - 775 sys sys 1203713005 76352
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/8prefix - 775 sys sys 1168402276 67103
 386/bin/aux/9pcon - 775 sys sys 1168402276 95153
@@ -190,7 +190,7 @@
 386/bin/cpp - 775 sys sys 1196742451 149149
 386/bin/cpu - 775 sys sys 1196742454 139159
 386/bin/crop - 775 sys sys 1168402298 116374
-386/bin/cwfs - 775 sys sys 1196742460 365810
+386/bin/cwfs - 775 sys sys 1203713012 365874
 386/bin/date - 775 sys sys 1178568265 41845
 386/bin/db - 775 sys sys 1188499570 349188
 386/bin/dc - 775 sys sys 1168402299 99260
@@ -208,7 +208,7 @@
 386/bin/disk/exsort - 775 sys sys 1168402301 60455
 386/bin/disk/fdisk - 775 sys sys 1197732699 104635
 386/bin/disk/format - 775 sys sys 1178568266 89440
-386/bin/disk/kfs - 775 sys sys 1190863302 248673
+386/bin/disk/kfs - 775 sys sys 1203713017 248737
 386/bin/disk/kfscmd - 775 sys sys 1148500626 38257
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1168402302 73918
@@ -475,7 +475,7 @@
 386/bin/upas/scanmail - 775 sys sys 1200262789 128213
 386/bin/upas/send - 775 sys sys 1200262792 192180
 386/bin/upas/smtp - 775 sys sys 1188530218 275629
-386/bin/upas/smtpd - 775 sys sys 1201551707 332410
+386/bin/upas/smtpd - 775 sys sys 1203713022 332905
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1200262795 83864
 386/bin/upas/token - 775 sys sys 1188447329 73042
@@ -560,7 +560,7 @@
 386/lib/lib9p.a - 664 sys sys 1184529909 91012
 386/lib/libString.a - 664 sys sys 1168402362 22126
 386/lib/libauth.a - 664 sys sys 1179372118 58864
-386/lib/libauthsrv.a - 664 sys sys 1192762788 36198
+386/lib/libauthsrv.a - 664 sys sys 1203713023 36452
 386/lib/libbin.a - 664 sys sys 1168402363 2534
 386/lib/libbio.a - 664 sys sys 1168402363 25980
 386/lib/libc.a - 664 sys sys 1188447448 502352
@@ -5531,7 +5531,7 @@ rc/bin/ipconf/outside - 775 sys sys 1058790951 550
 rc/bin/ipconf/theworld - 775 sys sys 1058790940 1212
 rc/bin/ipso - 775 sys sys 1201722823 3048
 rc/bin/ipv6on - 775 sys sys 1186362803 2047
-rc/bin/iwhois - 775 sys sys 1188682646 1792
+rc/bin/iwhois - 775 sys sys 1203659863 1883
 rc/bin/juke - 775 sys sys 1105565140 1131
 rc/bin/kill - 775 sys sys 1143389260 142
 rc/bin/kmem - 775 sys sys 1190076660 544
@@ -7597,7 +7597,7 @@ sys/man/2/hypot - 664 sys sys 1196638938 302
 sys/man/2/intmap - 664 sys sys 1196638940 2622
 sys/man/2/ioproc - 664 sys sys 1196638940 3060
 sys/man/2/iounit - 664 sys sys 1196638940 1001
-sys/man/2/ip - 664 sys sys 1196638938 7246
+sys/man/2/ip - 664 sys sys 1203659619 7257
 sys/man/2/isalpharune - 664 sys sys 1196638940 1059
 sys/man/2/keyboard - 664 sys sys 1196638940 2065
 sys/man/2/lock - 664 sys sys 1196638938 5705
@@ -14244,14 +14244,14 @@ sys/src/cmd/upas/send/skipequiv.c - 664 sys sys 944961322 1747
 sys/src/cmd/upas/send/translate.c - 664 sys sys 944961322 804
 sys/src/cmd/upas/send/tryit - 664 sys sys 944961322 584
 sys/src/cmd/upas/smtp - 20000000775 sys sys 1067741333 0
-sys/src/cmd/upas/smtp/greylist.c - 664 sys sys 1201502212 7114
+sys/src/cmd/upas/smtp/greylist.c - 664 sys sys 1203645194 7725
 sys/src/cmd/upas/smtp/mkfile - 664 sys sys 1108910002 801
 sys/src/cmd/upas/smtp/mxdial.c - 664 sys sys 1188509395 6813
 sys/src/cmd/upas/smtp/rfc822.y - 664 sys sys 1064589606 13417
 sys/src/cmd/upas/smtp/rmtdns.c - 664 sys sys 1188509396 1075
 sys/src/cmd/upas/smtp/smtp.c - 664 sys sys 1188509396 20717
 sys/src/cmd/upas/smtp/smtp.h - 664 sys sys 1188509396 1356
-sys/src/cmd/upas/smtp/smtpd.c - 664 sys sys 1201499389 33282
+sys/src/cmd/upas/smtp/smtpd.c - 664 sys sys 1203645213 33362
 sys/src/cmd/upas/smtp/smtpd.h - 664 sys sys 1201499389 1134
 sys/src/cmd/upas/smtp/smtpd.y - 664 sys sys 1181508390 6924
 sys/src/cmd/upas/smtp/spam.c - 664 sys sys 1139699502 10238
@@ -14790,7 +14790,7 @@ sys/src/libauthsrv/mkfile - 664 sys sys 1035389776 409
 sys/src/libauthsrv/nvcsum.c - 664 sys sys 1015091654 192
 sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1143695654 488
-sys/src/libauthsrv/readnvram.c - 664 sys sys 1188416573 10295
+sys/src/libauthsrv/readnvram.c - 664 sys sys 1203659639 10383
 sys/src/libavl - 20000000775 sys sys 1193775561 0
 sys/src/libavl/avl.c - 664 sys sys 1181339688 6448
 sys/src/libavl/mkfile - 664 sys sys 1130789697 193

+ 16 - 16
dist/replica/plan9.db

@@ -42,20 +42,20 @@
 386/bin/ascii - 775 sys sys 1168402265 64884
 386/bin/astro - 775 sys sys 1178568245 137403
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1188702764 140221
+386/bin/auth/aescbc - 775 sys sys 1203712992 140285
 386/bin/auth/asn12rsa - 775 sys sys 1188446816 121912
 386/bin/auth/authsrv - 775 sys sys 1201753318 165370
 386/bin/auth/changeuser - 775 sys sys 1178568246 96020
-386/bin/auth/convkeys - 775 sys sys 1188446822 87298
-386/bin/auth/convkeys2 - 775 sys sys 1188446825 87357
+386/bin/auth/convkeys - 775 sys sys 1203712993 87362
+386/bin/auth/convkeys2 - 775 sys sys 1203712994 87421
 386/bin/auth/cron - 775 sys sys 1188446828 140446
 386/bin/auth/debug - 775 sys sys 1192762780 102504
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1200717245 321923
+386/bin/auth/factotum - 775 sys sys 1203712996 321987
 386/bin/auth/fgui - 775 sys sys 1197732639 219095
 386/bin/auth/guard.srv - 775 sys sys 1201753321 144750
-386/bin/auth/keyfs - 775 sys sys 1191035876 116576
+386/bin/auth/keyfs - 775 sys sys 1203712999 116640
 386/bin/auth/login - 775 sys sys 1196742440 104821
 386/bin/auth/newns - 775 sys sys 1179372070 90035
 386/bin/auth/none - 775 sys sys 1179432184 89808
@@ -69,13 +69,13 @@
 386/bin/auth/rsafill - 775 sys sys 1168402273 143968
 386/bin/auth/rsagen - 775 sys sys 1178568249 151953
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1188702769 192724
+386/bin/auth/secstore - 775 sys sys 1203713003 192796
 386/bin/auth/secstored - 775 sys sys 1201753324 197600
 386/bin/auth/secuser - 775 sys sys 1188702776 149443
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1168402275 63314
 386/bin/auth/warning - 775 sys sys 1179372071 99970
-386/bin/auth/wrkey - 775 sys sys 1188446872 76288
+386/bin/auth/wrkey - 775 sys sys 1203713005 76352
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/8prefix - 775 sys sys 1168402276 67103
 386/bin/aux/9pcon - 775 sys sys 1168402276 95153
@@ -190,7 +190,7 @@
 386/bin/cpp - 775 sys sys 1196742451 149149
 386/bin/cpu - 775 sys sys 1196742454 139159
 386/bin/crop - 775 sys sys 1168402298 116374
-386/bin/cwfs - 775 sys sys 1196742460 365810
+386/bin/cwfs - 775 sys sys 1203713012 365874
 386/bin/date - 775 sys sys 1178568265 41845
 386/bin/db - 775 sys sys 1188499570 349188
 386/bin/dc - 775 sys sys 1168402299 99260
@@ -208,7 +208,7 @@
 386/bin/disk/exsort - 775 sys sys 1168402301 60455
 386/bin/disk/fdisk - 775 sys sys 1197732699 104635
 386/bin/disk/format - 775 sys sys 1178568266 89440
-386/bin/disk/kfs - 775 sys sys 1190863302 248673
+386/bin/disk/kfs - 775 sys sys 1203713017 248737
 386/bin/disk/kfscmd - 775 sys sys 1148500626 38257
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1168402302 73918
@@ -475,7 +475,7 @@
 386/bin/upas/scanmail - 775 sys sys 1200262789 128213
 386/bin/upas/send - 775 sys sys 1200262792 192180
 386/bin/upas/smtp - 775 sys sys 1188530218 275629
-386/bin/upas/smtpd - 775 sys sys 1201551707 332410
+386/bin/upas/smtpd - 775 sys sys 1203713022 332905
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1200262795 83864
 386/bin/upas/token - 775 sys sys 1188447329 73042
@@ -560,7 +560,7 @@
 386/lib/lib9p.a - 664 sys sys 1184529909 91012
 386/lib/libString.a - 664 sys sys 1168402362 22126
 386/lib/libauth.a - 664 sys sys 1179372118 58864
-386/lib/libauthsrv.a - 664 sys sys 1192762788 36198
+386/lib/libauthsrv.a - 664 sys sys 1203713023 36452
 386/lib/libbin.a - 664 sys sys 1168402363 2534
 386/lib/libbio.a - 664 sys sys 1168402363 25980
 386/lib/libc.a - 664 sys sys 1188447448 502352
@@ -5531,7 +5531,7 @@ rc/bin/ipconf/outside - 775 sys sys 1058790951 550
 rc/bin/ipconf/theworld - 775 sys sys 1058790940 1212
 rc/bin/ipso - 775 sys sys 1201722823 3048
 rc/bin/ipv6on - 775 sys sys 1186362803 2047
-rc/bin/iwhois - 775 sys sys 1188682646 1792
+rc/bin/iwhois - 775 sys sys 1203659863 1883
 rc/bin/juke - 775 sys sys 1105565140 1131
 rc/bin/kill - 775 sys sys 1143389260 142
 rc/bin/kmem - 775 sys sys 1190076660 544
@@ -7597,7 +7597,7 @@ sys/man/2/hypot - 664 sys sys 1196638938 302
 sys/man/2/intmap - 664 sys sys 1196638940 2622
 sys/man/2/ioproc - 664 sys sys 1196638940 3060
 sys/man/2/iounit - 664 sys sys 1196638940 1001
-sys/man/2/ip - 664 sys sys 1196638938 7246
+sys/man/2/ip - 664 sys sys 1203659619 7257
 sys/man/2/isalpharune - 664 sys sys 1196638940 1059
 sys/man/2/keyboard - 664 sys sys 1196638940 2065
 sys/man/2/lock - 664 sys sys 1196638938 5705
@@ -14244,14 +14244,14 @@ sys/src/cmd/upas/send/skipequiv.c - 664 sys sys 944961322 1747
 sys/src/cmd/upas/send/translate.c - 664 sys sys 944961322 804
 sys/src/cmd/upas/send/tryit - 664 sys sys 944961322 584
 sys/src/cmd/upas/smtp - 20000000775 sys sys 1067741333 0
-sys/src/cmd/upas/smtp/greylist.c - 664 sys sys 1201502212 7114
+sys/src/cmd/upas/smtp/greylist.c - 664 sys sys 1203645194 7725
 sys/src/cmd/upas/smtp/mkfile - 664 sys sys 1108910002 801
 sys/src/cmd/upas/smtp/mxdial.c - 664 sys sys 1188509395 6813
 sys/src/cmd/upas/smtp/rfc822.y - 664 sys sys 1064589606 13417
 sys/src/cmd/upas/smtp/rmtdns.c - 664 sys sys 1188509396 1075
 sys/src/cmd/upas/smtp/smtp.c - 664 sys sys 1188509396 20717
 sys/src/cmd/upas/smtp/smtp.h - 664 sys sys 1188509396 1356
-sys/src/cmd/upas/smtp/smtpd.c - 664 sys sys 1201499389 33282
+sys/src/cmd/upas/smtp/smtpd.c - 664 sys sys 1203645213 33362
 sys/src/cmd/upas/smtp/smtpd.h - 664 sys sys 1201499389 1134
 sys/src/cmd/upas/smtp/smtpd.y - 664 sys sys 1181508390 6924
 sys/src/cmd/upas/smtp/spam.c - 664 sys sys 1139699502 10238
@@ -14790,7 +14790,7 @@ sys/src/libauthsrv/mkfile - 664 sys sys 1035389776 409
 sys/src/libauthsrv/nvcsum.c - 664 sys sys 1015091654 192
 sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1143695654 488
-sys/src/libauthsrv/readnvram.c - 664 sys sys 1188416573 10295
+sys/src/libauthsrv/readnvram.c - 664 sys sys 1203659639 10383
 sys/src/libavl - 20000000775 sys sys 1193775561 0
 sys/src/libavl/avl.c - 664 sys sys 1181339688 6448
 sys/src/libavl/mkfile - 664 sys sys 1130789697 193

+ 16 - 0
dist/replica/plan9.log

@@ -18530,3 +18530,19 @@
 1203568203 5 c sys/src/cmd/usb/lib/usb.h - 664 sys sys 1203568227 7076
 1203568203 6 c sys/src/cmd/usb/lib/util.c - 664 sys sys 1203568227 533
 1203570003 0 c sys/man/8/smtp - 664 sys sys 1203569669 5497
+1203656406 0 c sys/src/cmd/upas/smtp/greylist.c - 664 sys sys 1203645194 7725
+1203656406 1 c sys/src/cmd/upas/smtp/smtpd.c - 664 sys sys 1203645213 33362
+1203660006 0 c rc/bin/iwhois - 775 sys sys 1203659863 1883
+1203660006 1 c sys/man/2/ip - 664 sys sys 1203659619 7257
+1203660006 2 c sys/src/libauthsrv/readnvram.c - 664 sys sys 1203659639 10383
+1203714004 0 c 386/bin/auth/aescbc - 775 sys sys 1203712992 140285
+1203714004 1 c 386/bin/auth/convkeys - 775 sys sys 1203712993 87362
+1203714004 2 c 386/bin/auth/convkeys2 - 775 sys sys 1203712994 87421
+1203714004 3 c 386/bin/auth/factotum - 775 sys sys 1203712996 321987
+1203714004 4 c 386/bin/auth/keyfs - 775 sys sys 1203712999 116640
+1203714004 5 c 386/bin/auth/secstore - 775 sys sys 1203713003 192796
+1203714004 6 c 386/bin/auth/wrkey - 775 sys sys 1203713005 76352
+1203714004 7 c 386/bin/cwfs - 775 sys sys 1203713012 365874
+1203714004 8 c 386/bin/disk/kfs - 775 sys sys 1203713017 248737
+1203714004 9 c 386/bin/upas/smtpd - 775 sys sys 1203713022 332905
+1203714004 10 c 386/lib/libauthsrv.a - 664 sys sys 1203713023 36452

+ 5 - 1
rc/bin/iwhois

@@ -1,6 +1,8 @@
 #!/bin/rc
-# iwhois domain - print registration data for domain
+# iwhois [-n] domain - print registration data for domain
 rfork e
+if (~ $#* 1 && ~ $1 -n)
+	noboiler=yes
 person=`{echo $1|sed s/@.*//}
 fn boilerplate { sed -n '/^[	 ]*[A-Za-z][A-Za-z]*:$/,$p' $* }
 
@@ -54,6 +56,8 @@ case *
 	machine=whois.internic.net	# alternate: whois.networksolutions.com
 	fn boilerplate { cat $* }
 }
+if (~ $noboiler yes)
+	fn boilerplate { cat $* }
 file=/tmp/iwhois$pid
 fn sigexit {
 	rm -f $file

+ 1 - 1
sys/man/2/ip

@@ -1,6 +1,6 @@
 .TH IP 2
 .SH NAME
-eipfmt, parseip, parseipmask, v4parseip, v4parsecidr, parseether, myipaddr, myetheraddr, maskip, equivip4, equivip6, defmask, isv4, v4tov6, v6tov4, nhgetv, nhgetl, nhgets, hnputv, hnputl, hnputs, ptclbsum, readipifc \- Internet protocol
+eipfmt, parseip, parseipmask, v4parseip, v4parsecidr, parseether, myipaddr, myetheraddr, maskip, equivip4, equivip6, defmask, isv4, v4tov6, v6tov4, nhgetv, nhgetl, nhgets, hnputv, hnputl, hnputs, ptclbsum, readipifc \- Internet Protocol addressing
 .SH SYNOPSIS
 .B #include <u.h>
 .br

+ 2 - 0
sys/src/libauthsrv/readnvram.c

@@ -39,6 +39,8 @@ static struct {
 	"pc", "#S/sd00/9fat", -1, sizeof(Nvrsafe),
 	"pc", "#S/sd01/nvram", 0, sizeof(Nvrsafe),
 	"pc", "#S/sd01/9fat", -1, sizeof(Nvrsafe),
+	"pc", "#S/sd10/nvram", 0, sizeof(Nvrsafe),
+	"pc", "#S/sd10/9fat", -1, sizeof(Nvrsafe),
 	"pc", "#f/fd0disk", -1, 512,	/* 512: #f requires whole sector reads */
 	"pc", "#f/fd1disk", -1, 512,
 	"mips", "#r/nvram", 1024+900, sizeof(Nvrsafe),