Browse Source

Plan 9 from Bell Labs 2006-05-09

David du Colombier 18 years ago
parent
commit
81bdd511ff

+ 13 - 13
dist/replica/_plan9.db

@@ -45,7 +45,7 @@
 386/bin/auth - 20000000775 sys sys 1016920815 0
 386/bin/auth/aescbc - 775 sys sys 1144688910 140827
 386/bin/auth/asn12rsa - 775 sys sys 1144688910 120832
-386/bin/auth/authsrv - 775 sys sys 1144688911 166594
+386/bin/auth/authsrv - 775 sys sys 1147107324 166594
 386/bin/auth/changeuser - 775 sys sys 1144688911 97391
 386/bin/auth/convkeys - 775 sys sys 1143777742 87820
 386/bin/auth/convkeys2 - 775 sys sys 1143777742 87879
@@ -55,7 +55,7 @@
 386/bin/auth/enable - 775 sys sys 1020319057 134
 386/bin/auth/factotum - 775 sys sys 1144256028 322096
 386/bin/auth/fgui - 775 sys sys 1143777744 218963
-386/bin/auth/guard.srv - 775 sys sys 1144688912 143771
+386/bin/auth/guard.srv - 775 sys sys 1147107324 143771
 386/bin/auth/iam - 775 sys sys 1085076981 50791
 386/bin/auth/keyfs - 775 sys sys 1144688912 115970
 386/bin/auth/login - 775 sys sys 1143777745 104842
@@ -72,7 +72,7 @@
 386/bin/auth/rsagen - 775 sys sys 1144169667 153628
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
 386/bin/auth/secstore - 775 sys sys 1144688914 195958
-386/bin/auth/secstored - 775 sys sys 1144688915 198070
+386/bin/auth/secstored - 775 sys sys 1147107325 198070
 386/bin/auth/secuser - 775 sys sys 1144688915 153331
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1143777752 63409
@@ -337,7 +337,7 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1144688943 150957
 386/bin/ndb/csquery - 775 sys sys 1143777822 61797
-386/bin/ndb/dns - 775 sys sys 1145033671 247331
+386/bin/ndb/dns - 775 sys sys 1147107326 247339
 386/bin/ndb/dnsdebug - 775 sys sys 1145033672 221818
 386/bin/ndb/dnsquery - 775 sys sys 1143777824 63965
 386/bin/ndb/dnstcp - 775 sys sys 1145033672 220786
@@ -5750,7 +5750,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1145776709 258931
+sys/games/lib/fortunes - 664 sys sys 1147102515 258975
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -7788,7 +7788,7 @@ sys/src/9/alphapc/etherif.h - 664 sys sys 1045063621 1025
 sys/src/9/alphapc/faultalpha.c - 664 sys sys 1015012784 1257
 sys/src/9/alphapc/fdc37c93x.c - 664 sys sys 1015012785 1110
 sys/src/9/alphapc/floppy.h - 664 sys sys 1015012785 3783
-sys/src/9/alphapc/fns.h - 664 sys sys 1143129891 3626
+sys/src/9/alphapc/fns.h - 664 sys sys 1147116740 3658
 sys/src/9/alphapc/fptrap.c - 664 sys sys 1015012785 707
 sys/src/9/alphapc/i8259.c - 664 sys sys 1015012785 3409
 sys/src/9/alphapc/initcode - 664 sys sys 1039753419 779
@@ -7803,7 +7803,7 @@ sys/src/9/alphapc/mkfile - 664 sys sys 1109218102 1682
 sys/src/9/alphapc/mmu.c - 664 sys sys 1131538486 4981
 sys/src/9/alphapc/osf1pal.h - 664 sys sys 1137179966 1471
 sys/src/9/alphapc/pci.c - 664 sys sys 1039753420 7868
-sys/src/9/alphapc/screen.h - 664 sys sys 1147023555 3888
+sys/src/9/alphapc/screen.h - 664 sys sys 1147108286 3923
 sys/src/9/alphapc/sd53c8xx.c - 664 sys sys 1137179967 55257
 sys/src/9/alphapc/sio.c - 664 sys sys 1015012787 293
 sys/src/9/alphapc/trap.c - 664 sys sys 1105030177 18099
@@ -7944,7 +7944,7 @@ sys/src/9/pc/apmjump.s - 664 sys sys 1032058947 1527
 sys/src/9/pc/archmp.c - 664 sys sys 1131290214 2357
 sys/src/9/pc/audio.h - 664 sys sys 1015014513 343
 sys/src/9/pc/cga.c - 664 sys sys 1015014513 1843
-sys/src/9/pc/dat.h - 664 sys sys 1142958313 6628
+sys/src/9/pc/dat.h - 664 sys sys 1147098951 6654
 sys/src/9/pc/devarch.c - 664 sys sys 1143129812 19249
 sys/src/9/pc/devether.c - 664 sys sys 1131290265 10315
 sys/src/9/pc/devfloppy.c - 664 sys sys 1142958305 20139
@@ -8000,7 +8000,7 @@ sys/src/9/pc/main.c - 664 sys sys 1142958321 15304
 sys/src/9/pc/mem.h - 664 sys sys 1137622431 5203
 sys/src/9/pc/memory.c - 664 sys sys 1131573303 18191
 sys/src/9/pc/mkfile - 664 sys sys 1142960857 3804
-sys/src/9/pc/mmu.c - 664 sys sys 1142124315 25229
+sys/src/9/pc/mmu.c - 664 sys sys 1147098958 24086
 sys/src/9/pc/mouse.c - 664 sys sys 1098479254 7057
 sys/src/9/pc/mp.c - 664 sys sys 1146542974 17317
 sys/src/9/pc/mp.h - 664 sys sys 1131538511 6652
@@ -8078,7 +8078,7 @@ sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
 sys/src/9/port/devaudio.c - 664 sys sys 1142086793 21147
 sys/src/9/port/devbridge.c - 664 sys sys 1055688301 24308
 sys/src/9/port/devcap.c - 664 sys sys 1048644215 4113
-sys/src/9/port/devcons.c - 664 sys sys 1143648105 23071
+sys/src/9/port/devcons.c - 664 sys sys 1147098985 23107
 sys/src/9/port/devdraw.c - 664 sys sys 1147023550 44447
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1048644225 6992
@@ -9535,7 +9535,7 @@ sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1106575526 859
 sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1140272944 8087
 sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1143465899 5136
 sys/src/cmd/auth/secstore/util.c - 664 sys sys 1143694883 1741
-sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1143648183 9006
+sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1147099026 9788
 sys/src/cmd/auth/status - 775 sys sys 1015008430 738
 sys/src/cmd/auth/uniq.c - 664 sys sys 1140272945 1440
 sys/src/cmd/auth/userpasswd.c - 664 sys sys 1015008432 591
@@ -12646,7 +12646,7 @@ sys/src/cmd/ndb/dn.c - 664 sys sys 1144952605 28763
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1121977162 2128
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1144952605 3066
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1144952604 15346
-sys/src/cmd/ndb/dns.c - 664 sys sys 1144952604 15308
+sys/src/cmd/ndb/dns.c - 664 sys sys 1147098969 15309
 sys/src/cmd/ndb/dns.h - 664 sys sys 1144969092 10171
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1144952604 8492
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1143759353 3982
@@ -13556,7 +13556,7 @@ sys/src/cmd/unix/drawterm/kern/devpipe.c - 664 sys sys 1135900767 5927
 sys/src/cmd/unix/drawterm/kern/devroot.c - 664 sys sys 1137502216 4755
 sys/src/cmd/unix/drawterm/kern/devssl.c - 664 sys sys 1135900767 26455
 sys/src/cmd/unix/drawterm/kern/devtab.c - 664 sys sys 1144150884 544
-sys/src/cmd/unix/drawterm/kern/devtls.c - 664 sys sys 1144150884 45295
+sys/src/cmd/unix/drawterm/kern/devtls.c - 664 sys sys 1147099089 45427
 sys/src/cmd/unix/drawterm/kern/error.c - 664 sys sys 1135900767 2100
 sys/src/cmd/unix/drawterm/kern/error.h - 664 sys sys 1135900768 2583
 sys/src/cmd/unix/drawterm/kern/exportfs.c - 664 sys sys 1135900768 13444

+ 13 - 13
dist/replica/plan9.db

@@ -45,7 +45,7 @@
 386/bin/auth - 20000000775 sys sys 1016920815 0
 386/bin/auth/aescbc - 775 sys sys 1144688910 140827
 386/bin/auth/asn12rsa - 775 sys sys 1144688910 120832
-386/bin/auth/authsrv - 775 sys sys 1144688911 166594
+386/bin/auth/authsrv - 775 sys sys 1147107324 166594
 386/bin/auth/changeuser - 775 sys sys 1144688911 97391
 386/bin/auth/convkeys - 775 sys sys 1143777742 87820
 386/bin/auth/convkeys2 - 775 sys sys 1143777742 87879
@@ -55,7 +55,7 @@
 386/bin/auth/enable - 775 sys sys 1020319057 134
 386/bin/auth/factotum - 775 sys sys 1144256028 322096
 386/bin/auth/fgui - 775 sys sys 1143777744 218963
-386/bin/auth/guard.srv - 775 sys sys 1144688912 143771
+386/bin/auth/guard.srv - 775 sys sys 1147107324 143771
 386/bin/auth/iam - 775 sys sys 1085076981 50791
 386/bin/auth/keyfs - 775 sys sys 1144688912 115970
 386/bin/auth/login - 775 sys sys 1143777745 104842
@@ -72,7 +72,7 @@
 386/bin/auth/rsagen - 775 sys sys 1144169667 153628
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
 386/bin/auth/secstore - 775 sys sys 1144688914 195958
-386/bin/auth/secstored - 775 sys sys 1144688915 198070
+386/bin/auth/secstored - 775 sys sys 1147107325 198070
 386/bin/auth/secuser - 775 sys sys 1144688915 153331
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1143777752 63409
@@ -337,7 +337,7 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1144688943 150957
 386/bin/ndb/csquery - 775 sys sys 1143777822 61797
-386/bin/ndb/dns - 775 sys sys 1145033671 247331
+386/bin/ndb/dns - 775 sys sys 1147107326 247339
 386/bin/ndb/dnsdebug - 775 sys sys 1145033672 221818
 386/bin/ndb/dnsquery - 775 sys sys 1143777824 63965
 386/bin/ndb/dnstcp - 775 sys sys 1145033672 220786
@@ -5750,7 +5750,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1145776709 258931
+sys/games/lib/fortunes - 664 sys sys 1147102515 258975
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -7788,7 +7788,7 @@ sys/src/9/alphapc/etherif.h - 664 sys sys 1045063621 1025
 sys/src/9/alphapc/faultalpha.c - 664 sys sys 1015012784 1257
 sys/src/9/alphapc/fdc37c93x.c - 664 sys sys 1015012785 1110
 sys/src/9/alphapc/floppy.h - 664 sys sys 1015012785 3783
-sys/src/9/alphapc/fns.h - 664 sys sys 1143129891 3626
+sys/src/9/alphapc/fns.h - 664 sys sys 1147116740 3658
 sys/src/9/alphapc/fptrap.c - 664 sys sys 1015012785 707
 sys/src/9/alphapc/i8259.c - 664 sys sys 1015012785 3409
 sys/src/9/alphapc/initcode - 664 sys sys 1039753419 779
@@ -7803,7 +7803,7 @@ sys/src/9/alphapc/mkfile - 664 sys sys 1109218102 1682
 sys/src/9/alphapc/mmu.c - 664 sys sys 1131538486 4981
 sys/src/9/alphapc/osf1pal.h - 664 sys sys 1137179966 1471
 sys/src/9/alphapc/pci.c - 664 sys sys 1039753420 7868
-sys/src/9/alphapc/screen.h - 664 sys sys 1147023555 3888
+sys/src/9/alphapc/screen.h - 664 sys sys 1147108286 3923
 sys/src/9/alphapc/sd53c8xx.c - 664 sys sys 1137179967 55257
 sys/src/9/alphapc/sio.c - 664 sys sys 1015012787 293
 sys/src/9/alphapc/trap.c - 664 sys sys 1105030177 18099
@@ -7944,7 +7944,7 @@ sys/src/9/pc/apmjump.s - 664 sys sys 1032058947 1527
 sys/src/9/pc/archmp.c - 664 sys sys 1131290214 2357
 sys/src/9/pc/audio.h - 664 sys sys 1015014513 343
 sys/src/9/pc/cga.c - 664 sys sys 1015014513 1843
-sys/src/9/pc/dat.h - 664 sys sys 1142958313 6628
+sys/src/9/pc/dat.h - 664 sys sys 1147098951 6654
 sys/src/9/pc/devarch.c - 664 sys sys 1143129812 19249
 sys/src/9/pc/devether.c - 664 sys sys 1131290265 10315
 sys/src/9/pc/devfloppy.c - 664 sys sys 1142958305 20139
@@ -8000,7 +8000,7 @@ sys/src/9/pc/main.c - 664 sys sys 1142958321 15304
 sys/src/9/pc/mem.h - 664 sys sys 1137622431 5203
 sys/src/9/pc/memory.c - 664 sys sys 1131573303 18191
 sys/src/9/pc/mkfile - 664 sys sys 1142960857 3804
-sys/src/9/pc/mmu.c - 664 sys sys 1142124315 25229
+sys/src/9/pc/mmu.c - 664 sys sys 1147098958 24086
 sys/src/9/pc/mouse.c - 664 sys sys 1098479254 7057
 sys/src/9/pc/mp.c - 664 sys sys 1146542974 17317
 sys/src/9/pc/mp.h - 664 sys sys 1131538511 6652
@@ -8078,7 +8078,7 @@ sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
 sys/src/9/port/devaudio.c - 664 sys sys 1142086793 21147
 sys/src/9/port/devbridge.c - 664 sys sys 1055688301 24308
 sys/src/9/port/devcap.c - 664 sys sys 1048644215 4113
-sys/src/9/port/devcons.c - 664 sys sys 1143648105 23071
+sys/src/9/port/devcons.c - 664 sys sys 1147098985 23107
 sys/src/9/port/devdraw.c - 664 sys sys 1147023550 44447
 sys/src/9/port/devdup.c - 664 sys sys 1014931172 2332
 sys/src/9/port/devenv.c - 664 sys sys 1048644225 6992
@@ -9535,7 +9535,7 @@ sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1106575526 859
 sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1140272944 8087
 sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1143465899 5136
 sys/src/cmd/auth/secstore/util.c - 664 sys sys 1143694883 1741
-sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1143648183 9006
+sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1147099026 9788
 sys/src/cmd/auth/status - 775 sys sys 1015008430 738
 sys/src/cmd/auth/uniq.c - 664 sys sys 1140272945 1440
 sys/src/cmd/auth/userpasswd.c - 664 sys sys 1015008432 591
@@ -12646,7 +12646,7 @@ sys/src/cmd/ndb/dn.c - 664 sys sys 1144952605 28763
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1121977162 2128
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1144952605 3066
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1144952604 15346
-sys/src/cmd/ndb/dns.c - 664 sys sys 1144952604 15308
+sys/src/cmd/ndb/dns.c - 664 sys sys 1147098969 15309
 sys/src/cmd/ndb/dns.h - 664 sys sys 1144969092 10171
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1144952604 8492
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1143759353 3982
@@ -13556,7 +13556,7 @@ sys/src/cmd/unix/drawterm/kern/devpipe.c - 664 sys sys 1135900767 5927
 sys/src/cmd/unix/drawterm/kern/devroot.c - 664 sys sys 1137502216 4755
 sys/src/cmd/unix/drawterm/kern/devssl.c - 664 sys sys 1135900767 26455
 sys/src/cmd/unix/drawterm/kern/devtab.c - 664 sys sys 1144150884 544
-sys/src/cmd/unix/drawterm/kern/devtls.c - 664 sys sys 1144150884 45295
+sys/src/cmd/unix/drawterm/kern/devtls.c - 664 sys sys 1147099089 45427
 sys/src/cmd/unix/drawterm/kern/error.c - 664 sys sys 1135900767 2100
 sys/src/cmd/unix/drawterm/kern/error.h - 664 sys sys 1135900768 2583
 sys/src/cmd/unix/drawterm/kern/exportfs.c - 664 sys sys 1135900768 13444

+ 13 - 0
dist/replica/plan9.log

@@ -29641,3 +29641,16 @@
 1147024835 2 c sys/src/9/pc/screen.h - 664 sys sys 1147023549 4256
 1147024835 3 c sys/src/9/port/devdraw.c - 664 sys sys 1147023550 44447
 1147057243 0 a 386/bin/aux/8prefix - 775 sys sys 1147057033 67198
+1147100456 0 c sys/src/9/pc/dat.h - 664 sys sys 1147098951 6654
+1147100456 1 c sys/src/9/pc/mmu.c - 664 sys sys 1147098958 24086
+1147100456 2 c sys/src/9/port/devcons.c - 664 sys sys 1147098985 23107
+1147100456 3 c sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1147099026 9788
+1147100456 4 c sys/src/cmd/ndb/dns.c - 664 sys sys 1147098969 15309
+1147100456 5 c sys/src/cmd/unix/drawterm/kern/devtls.c - 664 sys sys 1147099089 45427
+1147104057 0 c sys/games/lib/fortunes - 664 sys sys 1147102515 258975
+1147107659 0 c 386/bin/auth/authsrv - 775 sys sys 1147107324 166594
+1147107659 1 c 386/bin/auth/guard.srv - 775 sys sys 1147107324 143771
+1147107659 2 c 386/bin/auth/secstored - 775 sys sys 1147107325 198070
+1147107659 3 c 386/bin/ndb/dns - 775 sys sys 1147107326 247339
+1147109459 0 c sys/src/9/alphapc/screen.h - 664 sys sys 1147108286 3923
+1147118462 0 c sys/src/9/alphapc/fns.h - 664 sys sys 1147116740 3658

+ 1 - 0
sys/games/lib/fortunes

@@ -4121,3 +4121,4 @@ You’ve followed a link to a topic that doesn’t exist yet.
 Metaphors about deck chairs abound.
 After you have rotated your monitor, you need to complete the procedure below to rotate your operating system.
 The human genome is about 3 gigabases long, which boils down to 750 megabytes. Depressingly enough, this is only 2.8 Mozilla browsers.  - Bert Hubert
+cc: The parameter is incorrect.	- cygwin cc

+ 1 - 0
sys/src/9/alphapc/fns.h

@@ -10,6 +10,7 @@ void	clockintrsched(void);
 #define coherence 	mb
 int	cistrcmp(char*, char*);
 int	cistrncmp(char*, char*, int);
+int	cmpswap(long*, long, long);
 void	cpuidprint(void);
 void	cserve(ulong, ulong);
 #define cycles(x)	do{}while(0)

+ 1 - 1
sys/src/9/alphapc/screen.h

@@ -166,6 +166,6 @@ extern void	vgablank(VGAscr*, int);
 
 extern Lock	vgascreenlock;
 
-#define ishwimage(i)	((i)->data->bdata == vgascreen[0].gscreendata)
+#define ishwimage(i)	(vgascreen[0].gscreendata && (i)->data->bdata == vgascreen[0].gscreendata->bdata)
 
 

+ 1 - 0
sys/src/9/pc/dat.h

@@ -18,6 +18,7 @@ typedef struct Segdesc	Segdesc;
 typedef struct Ureg	Ureg;
 typedef struct Vctl	Vctl;
 
+#pragma incomplete Pcidev
 #pragma incomplete Ureg
 
 #define MAXSYSARG	5	/* for mount(fd, afd, mpt, flag, arg) */

+ 2 - 38
sys/src/9/pc/mmu.c

@@ -1034,44 +1034,8 @@ countpagerefs(ulong *ref, int print)
 }
 
 void
-checkfault(ulong addr, ulong pc)
+checkfault(ulong, ulong)
 {
-	ulong *a;
-	int i;
-	
-	print("user fault: addr=%.8lux pc=%.8lux\n", addr, pc);
-	if(!(vpd[PDX(addr)]&PTEVALID))
-		print("addr not mapped (vpd=%.8lux)\n", vpd[PDX(addr)]);
-	else if(!(vpt[VPTX(addr)]&PTEVALID))
-		print("addr not mapped (vpd=%.8lux vpt=%.8lux)\n",
-			vpd[PDX(addr)], vpt[VPTX(addr)]);
-	else
-		print("addr mapped (vpd=%.8lux vpt=%.8lux)\n",
-			vpd[PDX(addr)], vpt[VPTX(addr)]);
-	
-	if(!(vpd[PDX(pc)]&PTEVALID))
-		print("pc not mapped (vpd=%.8lux)\n", vpd[PDX(pc)]);
-	else if(!(vpt[VPTX(pc)]&PTEVALID))
-		print("pc not mapped (vpd=%.8lux vpt=%.8lux)\n",
-			vpd[PDX(pc)], vpt[VPTX(pc)]);
-	else{
-		print("pc mapped (vpd=%.8lux vpt=%.8lux)\n",
-			vpd[PDX(pc)], vpt[VPTX(pc)]);
-		if(PPN(pc) == PPN(pc+4))	/* not crossing into an unmapped page */
-			print("*pc: %.8lux\n", *(ulong*)pc);
-		a = (ulong*)PPN(pc);
-		for(i=0; i<WD2PG; i++)
-			if(a[i] != 0)
-				break;
-		if(i == WD2PG)
-			print("pc's page is all zeros\n");
-		else{
-			for(i=0; i<256/4; i+=8){
-				print("%.8lux: %.8lux %.8lux %.8lux %.8lux %.8lux %.8lux %.8lux %.8lux\n",
-					PPN(pc)+i*4, a[i], a[i+1], a[i+2], a[i+3], 
-					a[i+4], a[i+5], a[i+6], a[i+7]);
-			}
-		}
-	}
 }
 
+

+ 4 - 1
sys/src/9/port/devcons.c

@@ -1138,7 +1138,10 @@ static	ulong	randn;
 static void
 seedrand(void)
 {
-	randomread((void*)&randn, sizeof(randn));
+	if(!waserror()){
+		randomread((void*)&randn, sizeof(randn));
+		poperror();
+	}
 }
 
 int

+ 13 - 1
sys/src/cmd/auth/secureidcheck.c

@@ -1,3 +1,14 @@
+/*
+	This code uses RADIUS as a portable way to validate tokens such as SecurID.
+	It is relatively simple to send a UDP packet and get a response, but various
+	things can go wrong.  Speaking the proprietary ACE protocol would allow
+	handling "next token code" and other error messages.  More importantly, the
+	timeout threshold is inherently hard to pick.  We observe responses taking
+	longer than 10 seconds in normal times.  That is a long time to wait before
+	retrying on a second server.  Moreover, if the UDP response is lost, retrying
+	on a second server will also fail because the valid token code may be
+	presented only once.  This whole approach is flawed, but best we can do.
+*/
 /* RFC2138 */
 #include <u.h>
 #include <libc.h>
@@ -144,7 +155,8 @@ rpc(char *dest, Secret *shared, Packet *req)
 	atnotify(ding, 1);
 	m = -1;
 	for(try = 0; try < 2; try++){
-		alarm(4000);
+		/* increased timeout from 4sec to 15sec because corporate server really takes that long */
+		alarm(15000);
 		m = write(fd, buf, n);
 		if(m != n){
 			syslog(0, AUTHLOG, "%s: rpc write err %d %d: %r", dest, m, n);

+ 1 - 1
sys/src/cmd/ndb/dns.c

@@ -103,7 +103,7 @@ char	*LOG;
 void
 usage(void)
 {
-	fprint(2, "usage: %s [-rs] [-f ndb-file] [-x netmtpt]\n", argv0);
+	fprint(2, "usage: %s [-rRs] [-f ndb-file] [-x netmtpt]\n", argv0);
 	exits("usage");
 }
 

+ 12 - 8
sys/src/cmd/unix/drawterm/kern/devtls.c

@@ -241,14 +241,18 @@ static char	*tlsstate(int s);
 static void	pdump(int, void*, char*);
 
 static char *tlsnames[] = {
-[Qclonus]		"clone",
-[Qencalgs]	"encalgs",
-[Qhashalgs]	"hashalgs",
-[Qdata]		"data",
-[Qctl]		"ctl",
-[Qhand]		"hand",
-[Qstatus]		"status",
-[Qstats]		"stats",
+	/* unused */ 0,
+	/* topdir */ 0,
+	/* protodir */ 0,
+	"clone",		/* [Qclonus] */
+	"encalgs",		/* [Qencalgs] */
+	"hashalgs",		/* [Qhashalgs] */
+	/* convdir */ 0,
+	"data",			/* [Qdata] */
+	"ctl",			/* [Qctl] */
+	"hand",			/* [Qhand] */
+	"status",		/* [Qstatus] */
+	"stats",		/* [Qstats] */
 };
 
 static int convdir[] = { Qctl, Qdata, Qhand, Qstatus, Qstats };