Browse Source

Plan 9 from Bell Labs 2006-02-19

David du Colombier 15 years ago
parent
commit
84741f4af5

+ 43 - 43
dist/replica/_plan9.db

@@ -43,40 +43,40 @@
 386/bin/ascii - 775 sys sys 1135570770 64641
 386/bin/astro - 775 sys sys 1130384233 138837
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1138500222 140815
+386/bin/auth/aescbc - 775 sys sys 1140285589 140475
 386/bin/auth/asn12rsa - 775 sys sys 1135570770 120433
 386/bin/auth/authsrv - 775 sys sys 1135570771 165460
 386/bin/auth/changeuser - 775 sys sys 1135570771 97011
-386/bin/auth/convkeys - 775 sys sys 1138500239 87487
-386/bin/auth/convkeys2 - 775 sys sys 1138500253 87538
-386/bin/auth/cron - 775 sys sys 1135570772 143956
-386/bin/auth/debug - 775 sys sys 1135570772 101051
+386/bin/auth/convkeys - 775 sys sys 1140285589 87503
+386/bin/auth/convkeys2 - 775 sys sys 1140285589 87562
+386/bin/auth/cron - 775 sys sys 1140285590 143908
+386/bin/auth/debug - 775 sys sys 1140285590 101085
 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 1138500268 318365
+386/bin/auth/factotum - 775 sys sys 1140285591 318397
 386/bin/auth/fgui - 775 sys sys 1138500284 218624
 386/bin/auth/guard.srv - 775 sys sys 1135570774 142833
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1138500299 115630
-386/bin/auth/login - 775 sys sys 1135570774 104481
+386/bin/auth/keyfs - 775 sys sys 1140285591 115638
+386/bin/auth/login - 775 sys sys 1140285592 104525
 386/bin/auth/newns - 775 sys sys 1135570774 89719
 386/bin/auth/none - 775 sys sys 1135570775 89007
 386/bin/auth/pemdecode - 775 sys sys 1135570775 61451
 386/bin/auth/pemencode - 775 sys sys 1135570775 59847
-386/bin/auth/printnetkey - 775 sys sys 1130384240 40492
-386/bin/auth/rsa2csr - 775 sys sys 1135570775 180508
-386/bin/auth/rsa2pub - 775 sys sys 1135570776 143540
-386/bin/auth/rsa2ssh - 775 sys sys 1135570776 138857
-386/bin/auth/rsa2x509 - 775 sys sys 1135570777 184269
-386/bin/auth/rsafill - 775 sys sys 1135570777 143608
+386/bin/auth/printnetkey - 775 sys sys 1140285592 40436
+386/bin/auth/rsa2csr - 775 sys sys 1140285592 180611
+386/bin/auth/rsa2pub - 775 sys sys 1140285593 143643
+386/bin/auth/rsa2ssh - 775 sys sys 1140285593 138960
+386/bin/auth/rsa2x509 - 775 sys sys 1140285594 184372
+386/bin/auth/rsafill - 775 sys sys 1140285594 143711
 386/bin/auth/rsagen - 775 sys sys 1135570778 153242
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1138500327 195492
-386/bin/auth/secstored - 775 sys sys 1135570779 197002
-386/bin/auth/secuser - 775 sys sys 1135570779 152936
+386/bin/auth/secstore - 775 sys sys 1140285595 195580
+386/bin/auth/secstored - 775 sys sys 1140285595 197007
+386/bin/auth/secuser - 775 sys sys 1140285595 152935
 386/bin/auth/status - 775 sys sys 1020319060 738
-386/bin/auth/uniq - 775 sys sys 1135570779 63055
-386/bin/auth/warning - 775 sys sys 1135570779 100633
+386/bin/auth/uniq - 775 sys sys 1140285596 63092
+386/bin/auth/warning - 775 sys sys 1140285596 101058
 386/bin/auth/wrkey - 775 sys sys 1138500378 75242
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/9pcon - 775 sys sys 1135570780 94910
@@ -1276,7 +1276,7 @@ lib/face/48x48x2/x - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/y - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4 - 20000000775 sys sys 944941894 0
-lib/face/48x48x4/.dict - 664 sys sys 1133715253 2561
+lib/face/48x48x4/.dict - 664 sys sys 1140276005 2589
 lib/face/48x48x4/Z - 20000000775 sys sys 944945342 0
 lib/face/48x48x4/a - 20000000775 sys sys 944945701 0
 lib/face/48x48x4/a/adb.1 - 664 sys sys 944941890 962
@@ -1309,6 +1309,7 @@ lib/face/48x48x4/f - 20000000775 sys sys 944945448 0
 lib/face/48x48x4/f/freund.1 - 664 sys sys 944941891 1028
 lib/face/48x48x4/f/ftg.1 - 664 sys sys 944941891 919
 lib/face/48x48x4/g - 20000000775 sys sys 944941892 0
+lib/face/48x48x4/g/geoff.1 - 644 sys sys 1140277644 1168
 lib/face/48x48x4/g/george.1 - 664 sys sys 944941892 1100
 lib/face/48x48x4/g/gerard.1 - 664 sys sys 944941892 1088
 lib/face/48x48x4/g/ghost.1 - 664 sys sys 944941892 783
@@ -1388,7 +1389,7 @@ lib/face/48x48x4/x - 20000000775 sys sys 944941894 0
 lib/face/48x48x4/y - 20000000775 sys sys 944941894 0
 lib/face/48x48x4/z - 20000000775 sys sys 944941894 0
 lib/face/48x48x8 - 20000000775 sys sys 944941834 0
-lib/face/48x48x8/.dict - 664 sys sys 1136131377 5784
+lib/face/48x48x8/.dict - 664 sys sys 1140276022 5710
 lib/face/48x48x8/Z - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a/axel.1 - 664 sys sys 1056983599 473
@@ -1405,7 +1406,6 @@ lib/face/48x48x8/e - 20000000775 sys sys 944941833 0
 lib/face/48x48x8/f - 20000000775 sys sys 944941833 0
 lib/face/48x48x8/f/forsyth.1 - 664 sys sys 1056982111 1864
 lib/face/48x48x8/g - 20000000775 sys sys 944941833 0
-lib/face/48x48x8/g/geoff.2 - 664 sys sys 1057029459 1082
 lib/face/48x48x8/g/gmail.1 - 664 sys sys 1097900774 1779
 lib/face/48x48x8/g/google.1 - 664 sys sys 1038967265 712
 lib/face/48x48x8/h - 20000000775 sys sys 945319632 0
@@ -7956,7 +7956,7 @@ sys/src/9/pc/ether8139.c - 664 sys sys 1131290376 18400
 sys/src/9/pc/ether8169.c - 664 sys sys 1131290377 22723
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1131290377 32294
 sys/src/9/pc/ether82557.c - 664 sys sys 1131290377 30107
-sys/src/9/pc/ether83815.c - 664 sys sys 1133464742 23556
+sys/src/9/pc/ether83815.c - 664 sys sys 1140271743 26125
 sys/src/9/pc/ether8390.c - 664 sys sys 1131290377 17702
 sys/src/9/pc/ether8390.h - 664 sys sys 1015014517 1511
 sys/src/9/pc/etherdp83820.c - 664 sys sys 1134042756 29166
@@ -9443,10 +9443,10 @@ sys/src/cmd/auth/authsrv.c - 664 sys sys 1078839960 18395
 sys/src/cmd/auth/challenge.c - 664 sys sys 1015008432 980
 sys/src/cmd/auth/changeuser.c - 664 sys sys 1118884775 2932
 sys/src/cmd/auth/convbio.c - 664 sys sys 1015008432 2212
-sys/src/cmd/auth/convkeys.c - 664 sys sys 1015008430 2347
-sys/src/cmd/auth/convkeys2.c - 664 sys sys 1015008432 2401
-sys/src/cmd/auth/cron.c - 664 sys sys 1102346964 11487
-sys/src/cmd/auth/debug.c - 664 sys sys 1083771270 7356
+sys/src/cmd/auth/convkeys.c - 664 sys sys 1140272940 2370
+sys/src/cmd/auth/convkeys2.c - 664 sys sys 1140272940 2427
+sys/src/cmd/auth/cron.c - 664 sys sys 1140272940 11435
+sys/src/cmd/auth/debug.c - 664 sys sys 1140272941 7365
 sys/src/cmd/auth/disable - 775 sys sys 1015008431 146
 sys/src/cmd/auth/enable - 775 sys sys 1015008430 134
 sys/src/cmd/auth/factotum - 20000000775 sys sys 1017165894 0
@@ -9455,7 +9455,7 @@ sys/src/cmd/auth/factotum/chap.c - 664 sys sys 1107706103 8967
 sys/src/cmd/auth/factotum/confirm.c - 664 sys sys 1044829586 3103
 sys/src/cmd/auth/factotum/dat.h - 664 sys sys 1121367028 4946
 sys/src/cmd/auth/factotum/fgui.c - 664 sys sys 1130425760 15984
-sys/src/cmd/auth/factotum/fs.c - 664 sys sys 1131289797 10524
+sys/src/cmd/auth/factotum/fs.c - 664 sys sys 1140272941 10544
 sys/src/cmd/auth/factotum/log.c - 664 sys sys 1046655068 1781
 sys/src/cmd/auth/factotum/mkfile - 664 sys sys 1107706102 481
 sys/src/cmd/auth/factotum/p9any.c - 664 sys sys 1107706103 8484
@@ -9464,13 +9464,13 @@ sys/src/cmd/auth/factotum/p9sk1.c - 664 sys sys 1115143213 9743
 sys/src/cmd/auth/factotum/pass.c - 664 sys sys 1107706104 1514
 sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1107706104 3416
-sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1107633794 14935
+sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1140272941 14955
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1135487936 18042
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1140272942 18056
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1032497638 2334
 sys/src/cmd/auth/iam.c - 664 sys sys 1015008430 841
-sys/src/cmd/auth/keyfs.c - 664 sys sys 1121977157 17626
+sys/src/cmd/auth/keyfs.c - 664 sys sys 1140272942 17633
 sys/src/cmd/auth/lib - 20000000775 sys sys 1015008430 0
 sys/src/cmd/auth/lib/error.c - 664 sys sys 1015008430 301
 sys/src/cmd/auth/lib/fs.c - 664 sys sys 1015008430 228
@@ -9488,17 +9488,17 @@ sys/src/cmd/auth/lib/readln.c - 664 sys sys 1015008430 2040
 sys/src/cmd/auth/lib/readn.c - 664 sys sys 1015008430 247
 sys/src/cmd/auth/lib/readwrite.c - 664 sys sys 1015008430 1424
 sys/src/cmd/auth/lib/wrbio.c - 664 sys sys 1015008430 755
-sys/src/cmd/auth/login.c - 664 sys sys 1121977157 3981
+sys/src/cmd/auth/login.c - 664 sys sys 1140272942 4002
 sys/src/cmd/auth/mkfile - 664 sys sys 1132503359 1799
 sys/src/cmd/auth/netkey.c - 664 sys sys 1015008431 741
 sys/src/cmd/auth/newns.c - 664 sys sys 1128540497 962
 sys/src/cmd/auth/none.c - 664 sys sys 1116769155 774
-sys/src/cmd/auth/passwd.c - 664 sys sys 1055699009 2761
+sys/src/cmd/auth/passwd.c - 664 sys sys 1140272942 2769
 sys/src/cmd/auth/pemdecode.c - 664 sys sys 1084330528 947
 sys/src/cmd/auth/pemencode.c - 664 sys sys 1048614963 998
-sys/src/cmd/auth/printnetkey.c - 664 sys sys 1015008430 732
+sys/src/cmd/auth/printnetkey.c - 664 sys sys 1140272943 653
 sys/src/cmd/auth/respond.c - 664 sys sys 1015008432 472
-sys/src/cmd/auth/rsa2any.c - 664 sys sys 1048615896 3326
+sys/src/cmd/auth/rsa2any.c - 664 sys sys 1140272943 3407
 sys/src/cmd/auth/rsa2any.h - 664 sys sys 1048616450 43
 sys/src/cmd/auth/rsa2csr.c - 664 sys sys 1048614963 621
 sys/src/cmd/auth/rsa2pub.c - 664 sys sys 1048614964 651
@@ -9509,22 +9509,22 @@ sys/src/cmd/auth/rsagen.c - 664 sys sys 1048614963 992
 sys/src/cmd/auth/secstore - 20000000775 sys sys 1017337838 0
 sys/src/cmd/auth/secstore/SConn.c - 664 sys sys 1064789003 4419
 sys/src/cmd/auth/secstore/SConn.h - 664 sys sys 1015008431 955
-sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1103929625 4334
+sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1140272943 4064
 sys/src/cmd/auth/secstore/dirls.c - 664 sys sys 1062277640 1842
 sys/src/cmd/auth/secstore/mkfile - 664 sys sys 1106577499 836
-sys/src/cmd/auth/secstore/pak.c - 664 sys sys 1101135278 9290
+sys/src/cmd/auth/secstore/pak.c - 664 sys sys 1140272943 9314
 sys/src/cmd/auth/secstore/password.c - 664 sys sys 1106577427 2929
 sys/src/cmd/auth/secstore/secchk.c - 664 sys sys 1055698993 560
-sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1104176417 12526
+sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1140272944 12679
 sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1106575526 859
-sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1106575527 8065
-sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1103929625 5128
-sys/src/cmd/auth/secstore/util.c - 664 sys sys 1106575527 1819
+sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1140272944 8087
+sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1140272944 5137
+sys/src/cmd/auth/secstore/util.c - 664 sys sys 1140272945 1770
 sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1078840013 9007
 sys/src/cmd/auth/status - 775 sys sys 1015008430 738
-sys/src/cmd/auth/uniq.c - 664 sys sys 1015008430 1429
+sys/src/cmd/auth/uniq.c - 664 sys sys 1140272945 1440
 sys/src/cmd/auth/userpasswd.c - 664 sys sys 1015008432 591
-sys/src/cmd/auth/warning.c - 664 sys sys 1122901749 5303
+sys/src/cmd/auth/warning.c - 664 sys sys 1140272945 5271
 sys/src/cmd/auth/wrkey.c - 664 sys sys 1019058717 176
 sys/src/cmd/aux - 20000000775 sys sys 1015008975 0
 sys/src/cmd/aux/9pcon.c - 664 sys sys 1127394247 6284

+ 43 - 43
dist/replica/plan9.db

@@ -43,40 +43,40 @@
 386/bin/ascii - 775 sys sys 1135570770 64641
 386/bin/astro - 775 sys sys 1130384233 138837
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1138500222 140815
+386/bin/auth/aescbc - 775 sys sys 1140285589 140475
 386/bin/auth/asn12rsa - 775 sys sys 1135570770 120433
 386/bin/auth/authsrv - 775 sys sys 1135570771 165460
 386/bin/auth/changeuser - 775 sys sys 1135570771 97011
-386/bin/auth/convkeys - 775 sys sys 1138500239 87487
-386/bin/auth/convkeys2 - 775 sys sys 1138500253 87538
-386/bin/auth/cron - 775 sys sys 1135570772 143956
-386/bin/auth/debug - 775 sys sys 1135570772 101051
+386/bin/auth/convkeys - 775 sys sys 1140285589 87503
+386/bin/auth/convkeys2 - 775 sys sys 1140285589 87562
+386/bin/auth/cron - 775 sys sys 1140285590 143908
+386/bin/auth/debug - 775 sys sys 1140285590 101085
 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 1138500268 318365
+386/bin/auth/factotum - 775 sys sys 1140285591 318397
 386/bin/auth/fgui - 775 sys sys 1138500284 218624
 386/bin/auth/guard.srv - 775 sys sys 1135570774 142833
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1138500299 115630
-386/bin/auth/login - 775 sys sys 1135570774 104481
+386/bin/auth/keyfs - 775 sys sys 1140285591 115638
+386/bin/auth/login - 775 sys sys 1140285592 104525
 386/bin/auth/newns - 775 sys sys 1135570774 89719
 386/bin/auth/none - 775 sys sys 1135570775 89007
 386/bin/auth/pemdecode - 775 sys sys 1135570775 61451
 386/bin/auth/pemencode - 775 sys sys 1135570775 59847
-386/bin/auth/printnetkey - 775 sys sys 1130384240 40492
-386/bin/auth/rsa2csr - 775 sys sys 1135570775 180508
-386/bin/auth/rsa2pub - 775 sys sys 1135570776 143540
-386/bin/auth/rsa2ssh - 775 sys sys 1135570776 138857
-386/bin/auth/rsa2x509 - 775 sys sys 1135570777 184269
-386/bin/auth/rsafill - 775 sys sys 1135570777 143608
+386/bin/auth/printnetkey - 775 sys sys 1140285592 40436
+386/bin/auth/rsa2csr - 775 sys sys 1140285592 180611
+386/bin/auth/rsa2pub - 775 sys sys 1140285593 143643
+386/bin/auth/rsa2ssh - 775 sys sys 1140285593 138960
+386/bin/auth/rsa2x509 - 775 sys sys 1140285594 184372
+386/bin/auth/rsafill - 775 sys sys 1140285594 143711
 386/bin/auth/rsagen - 775 sys sys 1135570778 153242
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1138500327 195492
-386/bin/auth/secstored - 775 sys sys 1135570779 197002
-386/bin/auth/secuser - 775 sys sys 1135570779 152936
+386/bin/auth/secstore - 775 sys sys 1140285595 195580
+386/bin/auth/secstored - 775 sys sys 1140285595 197007
+386/bin/auth/secuser - 775 sys sys 1140285595 152935
 386/bin/auth/status - 775 sys sys 1020319060 738
-386/bin/auth/uniq - 775 sys sys 1135570779 63055
-386/bin/auth/warning - 775 sys sys 1135570779 100633
+386/bin/auth/uniq - 775 sys sys 1140285596 63092
+386/bin/auth/warning - 775 sys sys 1140285596 101058
 386/bin/auth/wrkey - 775 sys sys 1138500378 75242
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/9pcon - 775 sys sys 1135570780 94910
@@ -1276,7 +1276,7 @@ lib/face/48x48x2/x - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/y - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4 - 20000000775 sys sys 944941894 0
-lib/face/48x48x4/.dict - 664 sys sys 1133715253 2561
+lib/face/48x48x4/.dict - 664 sys sys 1140276005 2589
 lib/face/48x48x4/Z - 20000000775 sys sys 944945342 0
 lib/face/48x48x4/a - 20000000775 sys sys 944945701 0
 lib/face/48x48x4/a/adb.1 - 664 sys sys 944941890 962
@@ -1309,6 +1309,7 @@ lib/face/48x48x4/f - 20000000775 sys sys 944945448 0
 lib/face/48x48x4/f/freund.1 - 664 sys sys 944941891 1028
 lib/face/48x48x4/f/ftg.1 - 664 sys sys 944941891 919
 lib/face/48x48x4/g - 20000000775 sys sys 944941892 0
+lib/face/48x48x4/g/geoff.1 - 644 sys sys 1140277644 1168
 lib/face/48x48x4/g/george.1 - 664 sys sys 944941892 1100
 lib/face/48x48x4/g/gerard.1 - 664 sys sys 944941892 1088
 lib/face/48x48x4/g/ghost.1 - 664 sys sys 944941892 783
@@ -1388,7 +1389,7 @@ lib/face/48x48x4/x - 20000000775 sys sys 944941894 0
 lib/face/48x48x4/y - 20000000775 sys sys 944941894 0
 lib/face/48x48x4/z - 20000000775 sys sys 944941894 0
 lib/face/48x48x8 - 20000000775 sys sys 944941834 0
-lib/face/48x48x8/.dict - 664 sys sys 1136131377 5784
+lib/face/48x48x8/.dict - 664 sys sys 1140276022 5710
 lib/face/48x48x8/Z - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a/axel.1 - 664 sys sys 1056983599 473
@@ -1405,7 +1406,6 @@ lib/face/48x48x8/e - 20000000775 sys sys 944941833 0
 lib/face/48x48x8/f - 20000000775 sys sys 944941833 0
 lib/face/48x48x8/f/forsyth.1 - 664 sys sys 1056982111 1864
 lib/face/48x48x8/g - 20000000775 sys sys 944941833 0
-lib/face/48x48x8/g/geoff.2 - 664 sys sys 1057029459 1082
 lib/face/48x48x8/g/gmail.1 - 664 sys sys 1097900774 1779
 lib/face/48x48x8/g/google.1 - 664 sys sys 1038967265 712
 lib/face/48x48x8/h - 20000000775 sys sys 945319632 0
@@ -7956,7 +7956,7 @@ sys/src/9/pc/ether8139.c - 664 sys sys 1131290376 18400
 sys/src/9/pc/ether8169.c - 664 sys sys 1131290377 22723
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1131290377 32294
 sys/src/9/pc/ether82557.c - 664 sys sys 1131290377 30107
-sys/src/9/pc/ether83815.c - 664 sys sys 1133464742 23556
+sys/src/9/pc/ether83815.c - 664 sys sys 1140271743 26125
 sys/src/9/pc/ether8390.c - 664 sys sys 1131290377 17702
 sys/src/9/pc/ether8390.h - 664 sys sys 1015014517 1511
 sys/src/9/pc/etherdp83820.c - 664 sys sys 1134042756 29166
@@ -9443,10 +9443,10 @@ sys/src/cmd/auth/authsrv.c - 664 sys sys 1078839960 18395
 sys/src/cmd/auth/challenge.c - 664 sys sys 1015008432 980
 sys/src/cmd/auth/changeuser.c - 664 sys sys 1118884775 2932
 sys/src/cmd/auth/convbio.c - 664 sys sys 1015008432 2212
-sys/src/cmd/auth/convkeys.c - 664 sys sys 1015008430 2347
-sys/src/cmd/auth/convkeys2.c - 664 sys sys 1015008432 2401
-sys/src/cmd/auth/cron.c - 664 sys sys 1102346964 11487
-sys/src/cmd/auth/debug.c - 664 sys sys 1083771270 7356
+sys/src/cmd/auth/convkeys.c - 664 sys sys 1140272940 2370
+sys/src/cmd/auth/convkeys2.c - 664 sys sys 1140272940 2427
+sys/src/cmd/auth/cron.c - 664 sys sys 1140272940 11435
+sys/src/cmd/auth/debug.c - 664 sys sys 1140272941 7365
 sys/src/cmd/auth/disable - 775 sys sys 1015008431 146
 sys/src/cmd/auth/enable - 775 sys sys 1015008430 134
 sys/src/cmd/auth/factotum - 20000000775 sys sys 1017165894 0
@@ -9455,7 +9455,7 @@ sys/src/cmd/auth/factotum/chap.c - 664 sys sys 1107706103 8967
 sys/src/cmd/auth/factotum/confirm.c - 664 sys sys 1044829586 3103
 sys/src/cmd/auth/factotum/dat.h - 664 sys sys 1121367028 4946
 sys/src/cmd/auth/factotum/fgui.c - 664 sys sys 1130425760 15984
-sys/src/cmd/auth/factotum/fs.c - 664 sys sys 1131289797 10524
+sys/src/cmd/auth/factotum/fs.c - 664 sys sys 1140272941 10544
 sys/src/cmd/auth/factotum/log.c - 664 sys sys 1046655068 1781
 sys/src/cmd/auth/factotum/mkfile - 664 sys sys 1107706102 481
 sys/src/cmd/auth/factotum/p9any.c - 664 sys sys 1107706103 8484
@@ -9464,13 +9464,13 @@ sys/src/cmd/auth/factotum/p9sk1.c - 664 sys sys 1115143213 9743
 sys/src/cmd/auth/factotum/pass.c - 664 sys sys 1107706104 1514
 sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1107706104 3416
-sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1107633794 14935
+sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1140272941 14955
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1135487936 18042
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1140272942 18056
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1032497638 2334
 sys/src/cmd/auth/iam.c - 664 sys sys 1015008430 841
-sys/src/cmd/auth/keyfs.c - 664 sys sys 1121977157 17626
+sys/src/cmd/auth/keyfs.c - 664 sys sys 1140272942 17633
 sys/src/cmd/auth/lib - 20000000775 sys sys 1015008430 0
 sys/src/cmd/auth/lib/error.c - 664 sys sys 1015008430 301
 sys/src/cmd/auth/lib/fs.c - 664 sys sys 1015008430 228
@@ -9488,17 +9488,17 @@ sys/src/cmd/auth/lib/readln.c - 664 sys sys 1015008430 2040
 sys/src/cmd/auth/lib/readn.c - 664 sys sys 1015008430 247
 sys/src/cmd/auth/lib/readwrite.c - 664 sys sys 1015008430 1424
 sys/src/cmd/auth/lib/wrbio.c - 664 sys sys 1015008430 755
-sys/src/cmd/auth/login.c - 664 sys sys 1121977157 3981
+sys/src/cmd/auth/login.c - 664 sys sys 1140272942 4002
 sys/src/cmd/auth/mkfile - 664 sys sys 1132503359 1799
 sys/src/cmd/auth/netkey.c - 664 sys sys 1015008431 741
 sys/src/cmd/auth/newns.c - 664 sys sys 1128540497 962
 sys/src/cmd/auth/none.c - 664 sys sys 1116769155 774
-sys/src/cmd/auth/passwd.c - 664 sys sys 1055699009 2761
+sys/src/cmd/auth/passwd.c - 664 sys sys 1140272942 2769
 sys/src/cmd/auth/pemdecode.c - 664 sys sys 1084330528 947
 sys/src/cmd/auth/pemencode.c - 664 sys sys 1048614963 998
-sys/src/cmd/auth/printnetkey.c - 664 sys sys 1015008430 732
+sys/src/cmd/auth/printnetkey.c - 664 sys sys 1140272943 653
 sys/src/cmd/auth/respond.c - 664 sys sys 1015008432 472
-sys/src/cmd/auth/rsa2any.c - 664 sys sys 1048615896 3326
+sys/src/cmd/auth/rsa2any.c - 664 sys sys 1140272943 3407
 sys/src/cmd/auth/rsa2any.h - 664 sys sys 1048616450 43
 sys/src/cmd/auth/rsa2csr.c - 664 sys sys 1048614963 621
 sys/src/cmd/auth/rsa2pub.c - 664 sys sys 1048614964 651
@@ -9509,22 +9509,22 @@ sys/src/cmd/auth/rsagen.c - 664 sys sys 1048614963 992
 sys/src/cmd/auth/secstore - 20000000775 sys sys 1017337838 0
 sys/src/cmd/auth/secstore/SConn.c - 664 sys sys 1064789003 4419
 sys/src/cmd/auth/secstore/SConn.h - 664 sys sys 1015008431 955
-sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1103929625 4334
+sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1140272943 4064
 sys/src/cmd/auth/secstore/dirls.c - 664 sys sys 1062277640 1842
 sys/src/cmd/auth/secstore/mkfile - 664 sys sys 1106577499 836
-sys/src/cmd/auth/secstore/pak.c - 664 sys sys 1101135278 9290
+sys/src/cmd/auth/secstore/pak.c - 664 sys sys 1140272943 9314
 sys/src/cmd/auth/secstore/password.c - 664 sys sys 1106577427 2929
 sys/src/cmd/auth/secstore/secchk.c - 664 sys sys 1055698993 560
-sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1104176417 12526
+sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1140272944 12679
 sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1106575526 859
-sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1106575527 8065
-sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1103929625 5128
-sys/src/cmd/auth/secstore/util.c - 664 sys sys 1106575527 1819
+sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1140272944 8087
+sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1140272944 5137
+sys/src/cmd/auth/secstore/util.c - 664 sys sys 1140272945 1770
 sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1078840013 9007
 sys/src/cmd/auth/status - 775 sys sys 1015008430 738
-sys/src/cmd/auth/uniq.c - 664 sys sys 1015008430 1429
+sys/src/cmd/auth/uniq.c - 664 sys sys 1140272945 1440
 sys/src/cmd/auth/userpasswd.c - 664 sys sys 1015008432 591
-sys/src/cmd/auth/warning.c - 664 sys sys 1122901749 5303
+sys/src/cmd/auth/warning.c - 664 sys sys 1140272945 5271
 sys/src/cmd/auth/wrkey.c - 664 sys sys 1019058717 176
 sys/src/cmd/aux - 20000000775 sys sys 1015008975 0
 sys/src/cmd/aux/9pcon.c - 664 sys sys 1127394247 6284

+ 45 - 0
dist/replica/plan9.log

@@ -27760,3 +27760,48 @@
 1140168708 108 d sys/src/fs/dev/sony.c - 664 sys sys 1037805088 0
 1140202918 0 c sys/src/games/mkfile - 664 sys sys 1140203009 595
 1140210121 0 c sys/man/4/consolefs - 664 sys sys 1140209468 4241
+1140273019 0 c sys/src/9/pc/ether83815.c - 664 sys sys 1140271743 26125
+1140273019 1 c sys/src/cmd/auth/convkeys.c - 664 sys sys 1140272940 2370
+1140273019 2 c sys/src/cmd/auth/convkeys2.c - 664 sys sys 1140272940 2427
+1140273019 3 c sys/src/cmd/auth/cron.c - 664 sys sys 1140272940 11435
+1140273019 4 c sys/src/cmd/auth/debug.c - 664 sys sys 1140272941 7365
+1140273019 5 c sys/src/cmd/auth/factotum/fs.c - 664 sys sys 1140272941 10544
+1140273019 6 c sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1140272941 14955
+1140273019 7 c sys/src/cmd/auth/factotum/util.c - 664 sys sys 1140272942 18056
+1140273019 8 c sys/src/cmd/auth/keyfs.c - 664 sys sys 1140272942 17633
+1140273019 9 c sys/src/cmd/auth/login.c - 664 sys sys 1140272942 4002
+1140273019 10 c sys/src/cmd/auth/passwd.c - 664 sys sys 1140272942 2769
+1140273019 11 c sys/src/cmd/auth/printnetkey.c - 664 sys sys 1140272943 653
+1140273019 12 c sys/src/cmd/auth/rsa2any.c - 664 sys sys 1140272943 3407
+1140273019 13 c sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1140272943 4064
+1140273019 14 c sys/src/cmd/auth/secstore/pak.c - 664 sys sys 1140272943 9314
+1140273019 15 c sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1140272944 12679
+1140273019 16 c sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1140272944 8087
+1140273019 17 c sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1140272944 5137
+1140273019 18 c sys/src/cmd/auth/secstore/util.c - 664 sys sys 1140272945 1770
+1140273019 19 c sys/src/cmd/auth/uniq.c - 664 sys sys 1140272945 1440
+1140273019 20 c sys/src/cmd/auth/warning.c - 664 sys sys 1140272945 5271
+1140276621 0 c lib/face/48x48x4/.dict - 664 sys sys 1140276005 2589
+1140276621 1 a lib/face/48x48x4/g/geoff.1 - 644 sys sys 1140275990 964
+1140276621 2 c lib/face/48x48x8/.dict - 664 sys sys 1140276022 5710
+1140276621 3 d lib/face/48x48x8/g/geoff.2 - 664 sys sys 1057029459 0
+1140278421 0 c lib/face/48x48x4/g/geoff.1 - 644 sys sys 1140277644 1168
+1140285623 0 c 386/bin/auth/aescbc - 775 sys sys 1140285589 140475
+1140285623 1 c 386/bin/auth/convkeys - 775 sys sys 1140285589 87503
+1140285623 2 c 386/bin/auth/convkeys2 - 775 sys sys 1140285589 87562
+1140285623 3 c 386/bin/auth/cron - 775 sys sys 1140285590 143908
+1140285623 4 c 386/bin/auth/debug - 775 sys sys 1140285590 101085
+1140285623 5 c 386/bin/auth/factotum - 775 sys sys 1140285591 318397
+1140285623 6 c 386/bin/auth/keyfs - 775 sys sys 1140285591 115638
+1140285623 7 c 386/bin/auth/login - 775 sys sys 1140285592 104525
+1140285623 8 c 386/bin/auth/printnetkey - 775 sys sys 1140285592 40436
+1140285623 9 c 386/bin/auth/rsa2csr - 775 sys sys 1140285592 180611
+1140285623 10 c 386/bin/auth/rsa2pub - 775 sys sys 1140285593 143643
+1140285623 11 c 386/bin/auth/rsa2ssh - 775 sys sys 1140285593 138960
+1140285623 12 c 386/bin/auth/rsa2x509 - 775 sys sys 1140285594 184372
+1140285623 13 c 386/bin/auth/rsafill - 775 sys sys 1140285594 143711
+1140285623 14 c 386/bin/auth/secstore - 775 sys sys 1140285595 195580
+1140285623 15 c 386/bin/auth/secstored - 775 sys sys 1140285595 197007
+1140285623 16 c 386/bin/auth/secuser - 775 sys sys 1140285595 152935
+1140285623 17 c 386/bin/auth/uniq - 775 sys sys 1140285596 63092
+1140285623 18 c 386/bin/auth/warning - 775 sys sys 1140285596 101058

+ 1 - 0
lib/face/48x48x4/.dict

@@ -67,6 +67,7 @@ astro/wmc w/wmc.1
 binarydream.org/uriel u/uriel.1
 binarydream.org/uriell u/uriel.1
 closedmind.org/presotto p/presotto.1
+collyer.net/geoff g/geoff.1
 cpsc.ucalgary.ca/mirtchov a/andrey.1
 cs.princeton.edu/bwk b/bwk.1
 cs.utwente.nl/sape s/sape.1

BIN
lib/face/48x48x4/g/geoff.1


+ 0 - 3
lib/face/48x48x8/.dict

@@ -14,9 +14,7 @@ aol.com/mdelores 1/150th.1
 aprote.ee/t.lankots t/tiit.1
 ar/unknown u/unknown.ar
 astro/boyd b/boyd.1
-astro/collyer g/geoff.2
 astro/connie c/connie.1
-astro/geoff g/geoff.2
 astro/jab j/jab.1
 astro/vic v/vic.1
 at/unknown u/unknown.at
@@ -48,7 +46,6 @@ chello.nl/s.duch r/rfo.1
 chunder.com/brucee b/brucee.1
 cl/unknown u/unknown.cl
 cn/unknown u/unknown.cn
-collyer.net/geoff g/geoff.2
 comcast.net/IraMor 1/150th.1
 comcast.net/jaymorreale 1/150th.1
 comcast.net/pglick 1/150th.1

BIN
lib/face/48x48x8/g/geoff.2


+ 129 - 12
sys/src/9/pc/ether83815.c

@@ -79,9 +79,22 @@ enum {	/* cmdsts */
 	Col =	1<<16,		/* collision during receive */
 };
 
-enum {				/* Variants */
+enum {				/* PCI vendor & device IDs */
 	Nat83815	= (0x0020<<16)|0x100B,
-	Sis900 = (0x0630<<16)|0x1039,	/* untested */
+	SiS = 	0x1039,
+	SiS900 =	(0x0900<<16)|SiS,
+	SiS7016 =	(0x7016<<16)|SiS,
+
+	SiS630bridge	= 0x0008,
+
+	/* SiS 900 PCI revision codes */
+	SiSrev630s =	0x81,
+	SiSrev630e =	0x82,
+	SiSrev630ea1 =	0x83,
+
+	SiSeenodeaddr =	8,		/* short addr of SiS eeprom mac addr */
+	SiS630eenodeaddr =	9,	/* likewise for the 630 */
+	Nseenodeaddr =	6,		/* " for NS eeprom */
 };
 
 typedef struct Ctlr Ctlr;
@@ -511,11 +524,19 @@ interrupt(Ureg*, void* arg)
 				}
 				else if(bp = iallocb(Rbsz)){
 					len = (cmdsts&Size)-4;
-					des->bp->wp = des->bp->rp+len;
-					etheriq(ether, des->bp, 1);
+					if(len <= 0){
+						debug("ns83815: packet len %d <=0\n", len);
+						freeb(des->bp);
+					}else{
+						des->bp->wp = des->bp->rp+len;
+						etheriq(ether, des->bp, 1);
+					}
 					des->bp = bp;
 					des->addr = PADDR(bp->rp);
 					coherence();
+				}else{
+					debug("ns83815: interrupt: iallocb for input buffer failed\n");
+					des->bp->next = 0;
 				}
 
 				des->cmdsts = Rbsz;
@@ -607,7 +628,7 @@ ctlrinit(Ether* ether)
 	last = nil;
 	for(des = ctlr->rdr; des < &ctlr->rdr[ctlr->nrdr]; des++){
 		des->bp = iallocb(Rbsz);
-		if (des->bp == nil)
+		if(des->bp == nil)
 			error(Enomem);
 		des->cmdsts = Rbsz;
 		des->addr = PADDR(des->bp->rp);
@@ -810,8 +831,82 @@ static char* mediatable[9] = {
 	"100BASE-FXFD",
 };
 
+static int
+is630(ulong id, Pcidev *p)
+{
+	if(id == SiS900)
+		switch (p->rid) {
+		case SiSrev630s:
+		case SiSrev630e:
+	  	case SiSrev630ea1:
+			return 1;
+		}
+	return 0;
+}
+
+enum {
+	MagicReg = 0x48,
+	MagicRegSz = 1,
+	Magicrden = 0x40,	/* read enable, apparently */
+	Paddr=		0x70,	/* address port */
+	Pdata=		0x71,	/* data port */
+};
+
+/* rcmos() originally from LANL's SiS 900 driver's rcmos() */
+static int
+sisrdcmos(Ctlr *ctlr)
+{
+	int i;
+	unsigned reg;
+	ulong port;
+	Pcidev *p;
+
+	debug("ns83815: SiS 630 rev. %ux reading mac address from cmos\n", ctlr->pcidev->rid);
+	p = pcimatch(nil, SiS, SiS630bridge);
+	if(p == nil) {
+		print("ns83815: no SiS 630 rev. %ux bridge for mac addr\n",
+			ctlr->pcidev->rid);
+		return 0;
+	}
+	port = p->mem[0].bar & ~0x01;
+	debug("ns83815: SiS 630 rev. %ux reading mac addr from cmos via bridge at port 0x%lux\n", ctlr->pcidev->rid, port);
+
+	reg = pcicfgr8(p, MagicReg);
+	pcicfgw8(p, MagicReg, reg|Magicrden);
+
+	for (i = 0; i < Eaddrlen; i++) {
+		outb(port+Paddr, SiS630eenodeaddr + i);
+		ctlr->sromea[i] = inb(port+Pdata);
+	}
+
+	pcicfgw8(p, MagicReg, reg & ~Magicrden);
+	return 1;
+}
+
+/*
+ * If this is a SiS 630E chipset with an embedded SiS 900 controller,
+ * we have to read the MAC address from the APC CMOS RAM. - sez freebsd.
+ * However, CMOS *is* NVRAM normally.  See devrtc.c:440, memory.c:88.
+ */
 static void
-srom(Ctlr* ctlr)
+sissrom(Ctlr *ctlr)
+{
+	union {
+		uchar	eaddr[Eaddrlen];
+		ushort	alignment;
+	} ee;
+	int i, off = SiSeenodeaddr, cnt = sizeof ee.eaddr / sizeof(short);
+	ushort *shp = (ushort *)ee.eaddr;
+
+	if(!is630(ctlr->id, ctlr->pcidev) || !sisrdcmos(ctlr)) {
+		for (i = 0; i < cnt; i++)
+			*shp++ = eegetw(ctlr, off++);
+		memmove(ctlr->sromea, ee.eaddr, sizeof ctlr->sromea);
+	}
+}
+
+static void
+nssrom(Ctlr* ctlr)
 {
 	int i, j;
 
@@ -821,30 +916,50 @@ srom(Ctlr* ctlr)
 	/*
 	 * the MAC address is reversed, straddling word boundaries
 	 */
-	memset(ctlr->sromea, 0, sizeof(ctlr->sromea));
-	j = 6*16 + 15;
+	j = Nseenodeaddr*16 + 15;
 	for(i=0; i<48; i++){
 		ctlr->sromea[i>>3] |= ((ctlr->srom[j>>4] >> (15-(j&0xF))) & 1) << (i&7);
 		j++;
 	}
 }
 
+static void
+srom(Ctlr* ctlr)
+{
+	memset(ctlr->sromea, 0, sizeof(ctlr->sromea));
+	switch (ctlr->id) {
+	case SiS900:
+	case SiS7016:
+		sissrom(ctlr);
+		break;
+	case Nat83815:
+		nssrom(ctlr);
+		break;
+	default:
+		print("ns83815: srom: unknown id 0x%ux\n", ctlr->id);
+		break;
+	}
+}
+
 static void
 scanpci83815(void)
 {
 	Ctlr *ctlr;
 	Pcidev *p;
+	ulong id;
 
 	p = nil;
 	while(p = pcimatch(p, 0, 0)){
 		if(p->ccrb != 0x02 || p->ccru != 0)
 			continue;
-		switch((p->did<<16)|p->vid){
+		id = (p->did<<16)|p->vid;
+		switch(id){
 		default:
 			continue;
 
 		case Nat83815:
-		case Sis900:
+			break;
+		case SiS900:
 			break;
 		}
 
@@ -855,7 +970,7 @@ scanpci83815(void)
 		ctlr = malloc(sizeof(Ctlr));
 		ctlr->port = p->mem[0].bar & ~0x01;
 		ctlr->pcidev = p;
-		ctlr->id = (p->did<<16)|p->vid;
+		ctlr->id = id;
 
 		if(ioalloc(ctlr->port, p->mem[0].size, 0, "ns83815") < 0){
 			print("ns83815: port 0x%uX in use\n", ctlr->port);
@@ -885,6 +1000,7 @@ reset(Ether* ether)
 {
 	Ctlr *ctlr;
 	int i, x;
+	ulong ctladdr;
 	uchar ea[Eaddrlen];
 	static int scandone;
 
@@ -923,7 +1039,8 @@ reset(Ether* ether)
 		memmove(ether->ea, ctlr->sromea, Eaddrlen);
 	for(i=0; i<Eaddrlen; i+=2){
 		x = ether->ea[i] | (ether->ea[i+1]<<8);
-		csr32w(ctlr, Rrfcr, i);
+		ctladdr = (ctlr->id == Nat83815? i: i<<15);
+		csr32w(ctlr, Rrfcr, ctladdr);
 		csr32w(ctlr, Rrfdr, x);
 	}
 	csr32w(ctlr, Rrfcr, Rfen|Apm|Aab|Aam);

+ 3 - 2
sys/src/cmd/auth/convkeys.c

@@ -74,7 +74,7 @@ randombytes(uchar *p, int len)
 
 	fd = open("/dev/random", OREAD);
 	if(fd < 0){
-		fprint(2, "can't open /dev/random, using rand()\n");
+		fprint(2, "convkeys: can't open /dev/random, using rand()\n");
 		srand(time(0));
 		for(i = 0; i < len; i++)
 			p[i] = rand();
@@ -118,7 +118,8 @@ convert(char *p, char *key, int len)
 
 	len -= KEYDBOFF;
 	if(len % KEYDBLEN){
-		fprint(2, "file odd length; not converting %d bytes\n", len % KEYDBLEN);
+		fprint(2, "convkeys: file odd length; not converting %d bytes\n",
+			len % KEYDBLEN);
 		len -= len % KEYDBLEN;
 	}
 	len += KEYDBOFF;

+ 4 - 3
sys/src/cmd/auth/convkeys2.c

@@ -88,7 +88,8 @@ convert(char *p, char *np, char *key, int len)
 	int i, off, noff;
 
 	if(len % OKEYDBLEN)
-		fprint(2, "file odd length; not converting %d bytes\n", len % KEYDBLEN);
+		fprint(2, "convkeys2: file odd length; not converting %d bytes\n",
+			len % KEYDBLEN);
 	len /= OKEYDBLEN;
 	for(i = 0; i < len; i ++){
 		off = i*OKEYDBLEN;
@@ -108,7 +109,7 @@ convert(char *p, char *np, char *key, int len)
 void
 usage(void)
 {
-	fprint(2, "usage: convkeys keyfile\n");
+	fprint(2, "usage: convkeys2 keyfile\n");
 	exits("usage");
 }
 
@@ -119,7 +120,7 @@ randombytes(uchar *p, int len)
 
 	fd = open("/dev/random", OREAD);
 	if(fd < 0){
-		fprint(2, "can't open /dev/random, using rand()\n");
+		fprint(2, "convkeys2: can't open /dev/random, using rand()\n");
 		srand(time(0));
 		for(i = 0; i < len; i++)
 			p[i] = rand();

+ 4 - 8
sys/src/cmd/auth/cron.c

@@ -140,20 +140,16 @@ createuser(void)
 	user = getuser();
 	sprint(file, "/cron/%s", user);
 	fd = create(file, OREAD, 0755|DMDIR);
-	if(fd < 0){
-		fprint(2, "couldn't create %s: %r\n", file);
-		exits("create");
-	}
+	if(fd < 0)
+		sysfatal("couldn't create %s: %r", file);
 	nulldir(&d);
 	d.gid = user;
 	dirfwstat(fd, &d);
 	close(fd);
 	sprint(file, "/cron/%s/cron", user);
 	fd = create(file, OREAD, 0644);
-	if(fd < 0){
-		fprint(2, "couldn't create %s: %r\n", file);
-		exits("create");
-	}
+	if(fd < 0)
+		sysfatal("couldn't create %s: %r", file);
 	nulldir(&d);
 	d.gid = user;
 	dirfwstat(fd, &d);

+ 1 - 1
sys/src/cmd/auth/debug.c

@@ -103,7 +103,7 @@ debugfactotumkeys(void)
 
 	b = Bopen("/mnt/factotum/ctl", OREAD);
 	if(b == nil){
-		fprint(2, "cannot open /mnt/factotum/ctl");
+		fprint(2, "debug: cannot open /mnt/factotum/ctl\n");
 		return;
 	}
 	found = 0;

+ 2 - 2
sys/src/cmd/auth/factotum/fs.c

@@ -161,7 +161,7 @@ main(int argc, char **argv)
 				rerrstr(err, sizeof err);
 				if(strcmp(err, "cancel") == 0)
 					break;
-				fprint(2, "secstorefetch: %r\n");
+				fprint(2, "factotum: secstorefetch: %r\n");
 				fprint(2, "Enter an empty password to quit.\n");
 				free(secstorepw);
 				secstorepw = nil; /* just try nvram pw once */
@@ -170,7 +170,7 @@ main(int argc, char **argv)
 /*
 			rerrstr(err, sizeof err);
 			if(*err)
-				fprint(2, "havesecstore: %r\n");
+				fprint(2, "factotum: havesecstore: %r\n");
 */
 		}
 	}

+ 2 - 2
sys/src/cmd/auth/factotum/secstore.c

@@ -363,7 +363,7 @@ getfile(SConn *conn, uchar *key, int nkey)
 			*q++ = '\0';
 		n++;
 		if(ctlwrite(p, 0) < 0)
-			fprint(2, "secstore(%s) line %d: %r\n", gf, n);
+			fprint(2, "factotum: secstore(%s) line %d: %r\n", gf, n);
 		p = q;
 	}
 	free(buf);
@@ -497,7 +497,7 @@ PAKclient(SConn *conn, char *C, char *pass, char **pS)
 
 	// recv g**y, S, check hash1(g**xy)
 	if(readstr(conn, mess) < 0){
-		fprint(2, "error: %s\n", mess);
+		fprint(2, "factotum: error: %s\n", mess);
 		writerr(conn, "couldn't read g**y");
 		goto done;
 	}

+ 2 - 1
sys/src/cmd/auth/factotum/util.c

@@ -948,7 +948,8 @@ writehostowner(char *owner)
 	fd = open("#c/hostowner", OWRITE);
 	if(fd >= 0){
 		if(fprint(fd, "%s", owner) < 0)
-			fprint(2, "setting #c/hostowner to %q: %r\n", owner);
+			fprint(2, "factotum: setting #c/hostowner to %q: %r\n",
+				owner);
 		close(fd);
 	}
 }

+ 1 - 1
sys/src/cmd/auth/keyfs.c

@@ -679,7 +679,7 @@ randombytes(uchar *p, int len)
 
 	fd = open("/dev/random", OREAD);
 	if(fd < 0){
-		fprint(2, "can't open /dev/random, using rand()\n");
+		fprint(2, "keyfs: can't open /dev/random, using rand()\n");
 		srand(time(0));
 		for(i = 0; i < len; i++)
 			p[i] = rand();

+ 3 - 3
sys/src/cmd/auth/login.c

@@ -15,7 +15,7 @@ readln(char *prompt, char *line, int len, int raw)
 	if(raw){
 		ctl = open("/dev/consctl", OWRITE);
 		if(ctl < 0){
-			fprint(2, "couldn't set raw mode");
+			fprint(2, "login: couldn't set raw mode");
 			exits("readln");
 		}
 		write(ctl, "rawon", 5);
@@ -29,7 +29,7 @@ readln(char *prompt, char *line, int len, int raw)
 			close(ctl);
 			close(fdin);
 			close(fdout);
-			fprint(2, "can't read cons");
+			fprint(2, "login: can't read cons");
 			exits("readln");
 		}
 		if(*p == 0x7f)
@@ -162,7 +162,7 @@ main(int argc, char *argv[])
 
 	service = getenv("service");
 	if(strcmp(service, "cpu") == 0)
-		fprint(2, "warning: running on a cpu server!\n");
+		fprint(2, "login: warning: running on a cpu server!\n");
 	if(argc != 1){
 		fprint(2, "usage: login username\n");
 		exits("usage");

+ 1 - 1
sys/src/cmd/auth/passwd.c

@@ -130,7 +130,7 @@ main(int argc, char **argv)
 			error("AS protocol botch: %r");
 		if(asrdresp(fd, buf, 0) == 0)
 			break;
-		fprint(2, "refused: %r\n");
+		fprint(2, "passwd: refused: %r\n");
 	}
 	close(fd);
 

+ 0 - 4
sys/src/cmd/auth/printnetkey.c

@@ -26,10 +26,6 @@ main(int argc, char *argv[])
 	u = argv[0];
 	fmtinstall('K', keyfmt);
 	
-	if(argc != 1){
-		fprint(2, "usage: printnetkey user\n");
-		exits("usage");
-	}
 	if(memchr(u, '\0', ANAMELEN) == 0)
 		error("bad user name");
 	key = findkey(NETKEYDB, u, keybuf);

+ 9 - 9
sys/src/cmd/auth/rsa2any.c

@@ -70,11 +70,11 @@ getkey(int argc, char **argv, int needprivate, Attr **pa)
 		return nil;
 	}
 	if((p = _strfindattr(a, "size")) == nil)
-		fprint(2, "warning: missing size; will add\n");
+		fprint(2, "rsa2any: warning: missing size; will add\n");
 	else if((sz = strtol(p, &p, 10)) == 0 || *p != 0)
-		fprint(2, "warning: bad size; will correct\n");
+		fprint(2, "rsa2any: warning: bad size; will correct\n");
 	else if(sz != mpsignif(key->pub.n))
-		fprint(2, "warning: wrong size (got %d, expected %d); will correct\n",
+		fprint(2, "rsa2any: warning: wrong size (got %d, expected %d); will correct\n",
 			sz, mpsignif(key->pub.n));
 	if(!needprivate)
 		goto call;
@@ -103,32 +103,32 @@ getkey(int argc, char **argv, int needprivate, Attr **pa)
 		return nil;
 	}
 	if((p = _strfindattr(a, "!kp")) == nil){
-		fprint(2, "warning: no !kp\n");
+		fprint(2, "rsa2any: warning: no !kp\n");
 		regen = 1;
 		goto regen;
 	}
 	if((key->kp = strtomp(p, &p, 16, nil)) == nil || *p != 0){
-		fprint(2, "warning: bad !kp\n");
+		fprint(2, "rsa2any: warning: bad !kp\n");
 		regen = 1;	
 		goto regen;
 	}
 	if((p = _strfindattr(a, "!kq")) == nil){
-		fprint(2, "warning: no !kq\n");
+		fprint(2, "rsa2any: warning: no !kq\n");
 		regen = 1;	
 		goto regen;
 	}
 	if((key->kq = strtomp(p, &p, 16, nil)) == nil || *p != 0){
-		fprint(2, "warning: bad !kq\n");
+		fprint(2, "rsa2any: warning: bad !kq\n");
 		regen = 1;	
 		goto regen;
 	}
 	if((p = _strfindattr(a, "!c2")) == nil){
-		fprint(2, "warning: no !c2\n");
+		fprint(2, "rsa2any: warning: no !c2\n");
 		regen = 1;	
 		goto regen;
 	}
 	if((key->c2 = strtomp(p, &p, 16, nil)) == nil || *p != 0){
-		fprint(2, "warning: bad !c2\n");
+		fprint(2, "rsa2any: warning: bad !c2\n");
 		regen = 1;	
 		goto regen;
 	}

+ 12 - 28
sys/src/cmd/auth/secstore/aescbc.c

@@ -22,23 +22,15 @@ Biobuf bout;
 void
 safewrite(uchar *buf, int n)
 {
-	int i = Bwrite(&bout, buf, n);
-
-	if(i == n)
-		return;
-	fprint(2, "write error\n");
-	exits("write error");
+	if(Bwrite(&bout, buf, n) != n)
+		sysfatal("write error");
 }
 
 void
 saferead(uchar *buf, int n)
 {
-	int i = Bread(&bin, buf, n);
-
-	if(i == n)
-		return;
-	fprint(2, "read error\n");
-	exits("read error");
+	if(Bread(&bin, buf, n) != n)
+		sysfatal("read error");
 }
 
 int
@@ -93,10 +85,8 @@ main(int argc, char **argv)
 		memset(pass, 0, n);
 		free(pass);
 	}
-	if(n <= 0){
-		fprint(2,"no key\n");
-		exits("key");
-	}
+	if(n <= 0)
+		sysfatal("no key");
 	dstate = sha1((uchar*)"aescbc file", 11, nil, nil);
 	sha1(buf, n, key2, dstate);
 	memcpy(key, key2, 16);
@@ -112,10 +102,8 @@ main(int argc, char **argv)
 		dstate = hmac_sha1(buf+AESbsize, AESbsize, key2, MD5dlen, 0, 0);
 		while(1){
 			n = Bread(&bin, buf, BUF);
-			if(n < 0){
-				fprint(2,"read error\n");
-				exits("read error");
-			}
+			if(n < 0)
+				sysfatal("read error");
 			aesCBCencrypt(buf, n, &aes);
 			safewrite(buf, n);
 			dstate = hmac_sha1(buf, n, key2, MD5dlen, 0, dstate);
@@ -139,10 +127,8 @@ main(int argc, char **argv)
 				memmove(buf, buf+n, SHA1dlen);  /* these bytes are not yet decrypted */
 			}
 			hmac_sha1(0, 0, key2, MD5dlen, buf+SHA1dlen, dstate);
-			if(memcmp(buf, buf+SHA1dlen, SHA1dlen) != 0){
-				fprint(2,"decrypted file failed to authenticate\n");
-				exits("decrypted file failed to authenticate");
-			}
+			if(memcmp(buf, buf+SHA1dlen, SHA1dlen) != 0)
+				sysfatal("decrypted file failed to authenticate");
 		}else{ /* compatibility with past mistake */
 			// if file was encrypted with bad aescbc use this:
 			//         memset(key, 0, AESmaxkey);
@@ -155,10 +141,8 @@ main(int argc, char **argv)
 				safewrite(buf, n);
 				memmove(buf, buf+n, CHK);
 			}
-			if(memcmp(buf, "XXXXXXXXXXXXXXXX", CHK) != 0){
-				fprint(2,"decrypted file failed to authenticate\n");
-				exits("decrypted file failed to authenticate");
-			}
+			if(memcmp(buf, "XXXXXXXXXXXXXXXX", CHK) != 0)
+				sysfatal("decrypted file failed to authenticate");
 		}
 	}
 	exits("");

+ 3 - 3
sys/src/cmd/auth/secstore/pak.c

@@ -124,7 +124,7 @@ PAKclient(SConn *conn, char *C, char *pass, char **pS)
 
 	hexHi = PAK_Hi(C, pass, H, Hi);
 	if(verbose)
-		fprint(2,"%s\n", feedback[H->p[0]&0x7]);  // provide a clue to catch typos
+		fprint(2, "%s\n", feedback[H->p[0]&0x7]);  // provide a clue to catch typos
 
 	// random 1<=x<=q-1; send C, m=g**x H
 	x = mprand(240, genrandom, nil);
@@ -142,7 +142,7 @@ PAKclient(SConn *conn, char *C, char *pass, char **pS)
 
 	// recv g**y, S, check hash1(g**xy)
 	if(readstr(conn, mess) < 0){
-		fprint(2, "error: %s\n", mess);
+		fprint(2, "%s: error: %s\n", argv0, mess);
 		writerr(conn, "couldn't read g**y");
 		goto done;
 	}
@@ -240,7 +240,7 @@ PAKserver(SConn *conn, char *S, char *mess, PW **pwp)
 	// parse first message into C, m
 	eol = strchr(mess, '\n');
 	if(strncmp("C=", mess, 2) != 0 || !eol){
-		fprint(2,"mess[1]=%s\n", mess);
+		fprint(2, "%s: mess[1]=%s\n", argv0, mess);
 		writerr(conn, "PAK version mismatch");
 		goto done;
 	}

+ 36 - 40
sys/src/cmd/auth/secstore/secstore.c

@@ -35,7 +35,7 @@ getfile(SConn *conn, char *gf, uchar **buf, ulong *buflen, uchar *key, int nkey)
 	DigestState *sha;
 
 	if(strchr(gf, '/')){
-		fprint(2, "simple filenames, not paths like %s\n", gf);
+		fprint(2, "secstore: simple filenames, not paths like %s\n", gf);
 		return -1;
 	}
 	memset(&aes, 0, sizeof aes);
@@ -47,18 +47,18 @@ getfile(SConn *conn, char *gf, uchar **buf, ulong *buflen, uchar *key, int nkey)
 	s[0] = '\0';
 	bufw = bufe = nil;
 	if(readstr(conn, s) < 0){
-		fprint(2, "remote: %s\n", s);
+		fprint(2, "secstore: remote: %s\n", s);
 		return -1;
 	}
 	len = atoi(s);
 	if(len == -1){
-		fprint(2, "remote file %s does not exist\n", gf);
+		fprint(2, "secstore: remote file %s does not exist\n", gf);
 		return -1;
 	}else if(len == -3){
-		fprint(2, "implausible filesize for %s\n", gf);
+		fprint(2, "secstore: implausible filesize for %s\n", gf);
 		return -1;
 	}else if(len < 0){
-		fprint(2, "GET refused for %s\n", gf);
+		fprint(2, "secstore: GET refused for %s\n", gf);
 		return -1;
 	}
 	if(buf != nil){
@@ -73,7 +73,7 @@ getfile(SConn *conn, char *gf, uchar **buf, ulong *buflen, uchar *key, int nkey)
 			*buflen = len;
 		for(i=0; i < len; i += n){
 			if((n = conn->read(conn, (uchar*)s, Maxmsg)) <= 0){
-				fprint(2, "empty file chunk\n");
+				fprint(2, "secstore: empty file chunk\n");
 				return -1;
 			}
 			if(buf == nil)
@@ -87,21 +87,22 @@ getfile(SConn *conn, char *gf, uchar **buf, ulong *buflen, uchar *key, int nkey)
 	/* conn is already encrypted against wiretappers, 
 		but gf is also encrypted against server breakin. */
 	if(buf == nil && (fd =create(gf, OWRITE, 0600)) < 0){
-		fprint(2, "can't open %s: %r\n", gf);
+		fprint(2, "secstore: can't open %s: %r\n", gf);
 		return -1;
 	}
 
 	ibr = ibw = ib;
 	for(nr=0; nr < len;){
 		if((n = conn->read(conn, ibw, Maxmsg)) <= 0){
-			fprint(2, "empty file chunk n=%d nr=%d len=%d: %r\n", n, nr, len);
+			fprint(2, "secstore: empty file chunk n=%d nr=%d len=%d: %r\n",
+				n, nr, len);
 			return -1;
 		}
 		nr += n;
 		ibw += n;
 		if(!aes.setup){ /* first time, read 16 byte IV */
 			if(n < AESbsize){
-				fprint(2, "no IV in file\n");
+				fprint(2, "secstore: no IV in file\n");
 				return -1;
 			}
 			sha = sha1((uchar*)"aescbc file", 11, nil, nil);
@@ -117,7 +118,7 @@ getfile(SConn *conn, char *gf, uchar **buf, ulong *buflen, uchar *key, int nkey)
 			if(buf == nil){
 				nw = write(fd, ibr, n);
 				if(nw != n){
-					fprint(2, "write error on %s", gf);
+					fprint(2, "secstore: write error on %s", gf);
 					return -1;
 				}
 			}else{
@@ -135,8 +136,8 @@ getfile(SConn *conn, char *gf, uchar **buf, ulong *buflen, uchar *key, int nkey)
 		close(fd);
 	n = ibw-ibr;
 	if((n != CHK) || (memcmp(ib, "XXXXXXXXXXXXXXXX", CHK) != 0)){
-			fprint(2,"decrypted file failed to authenticate!\n");
-			return -1;
+		fprint(2, "secstore: decrypted file failed to authenticate!\n");
+		return -1;
 	}
 	return 0;
 }
@@ -167,7 +168,7 @@ putfile(SConn *conn, char *pf, uchar *buf, ulong len, uchar *key, int nkey)
 	if(buf == nil){
 		/* get file size */
 		if((fd = open(pf, OREAD)) < 0){
-			fprint(2, "can't open %s: %r\n", pf);
+			fprint(2, "secstore: can't open %s: %r\n", pf);
 			return -1;
 		}
 		len = seek(fd, 0, 2);
@@ -176,7 +177,8 @@ putfile(SConn *conn, char *pf, uchar *buf, ulong len, uchar *key, int nkey)
 		fd = -1;
 	}
 	if(len > MAXFILESIZE){
-		fprint(2, "implausible filesize %ld for %s\n", len, pf);
+		fprint(2, "secstore: implausible filesize %ld for %s\n",
+			len, pf);
 		return -1;
 	}
 
@@ -192,7 +194,8 @@ putfile(SConn *conn, char *pf, uchar *buf, ulong len, uchar *key, int nkey)
 		if(buf == nil){
 			n = read(fd, b+ivo, Maxmsg-ivo);
 			if(n < 0){
-				fprint(2, "read error on %s: %r\n", pf);
+				fprint(2, "secstore: read error on %s: %r\n",
+					pf);
 				return -1;
 			}
 		}else{
@@ -220,7 +223,7 @@ putfile(SConn *conn, char *pf, uchar *buf, ulong len, uchar *key, int nkey)
 
 	if(buf == nil)
 		close(fd);
-	fprint(2, "saved %ld bytes\n", len);
+	fprint(2, "secstore: saved %ld bytes\n", len);
 
 	return 0;
 }
@@ -231,7 +234,7 @@ removefile(SConn *conn, char *rf)
 	char buf[Maxmsg];
 
 	if(strchr(rf, '/')){
-		fprint(2, "simple filenames, not paths like %s\n", rf);
+		fprint(2, "secstore: simple filenames, not paths like %s\n", rf);
 		return -1;
 	}
 
@@ -326,11 +329,11 @@ chpasswd(AuthConn *c, char *id)
 	snprint(prompt, sizeof(prompt), "retype password: ");
 	passck = getpassm(prompt);
 	if(passck == nil){
-		fprint(2, "getpassm failed\n");
+		fprint(2, "secstore: getpassm failed\n");
 		goto Out;
 	}
 	if(strcmp(passck, newpass) != 0){
-		fprint(2, "passwords didn't match\n");
+		fprint(2, "secstore: passwords didn't match\n");
 		goto Out;
 	}
 
@@ -342,7 +345,7 @@ chpasswd(AuthConn *c, char *id)
 	mpfree(Hi);
 
 	if(getfile(c->conn, ".", (uchar **) &list, &len, nil, 0) < 0){
-		fprint(2, "directory listing failed.\n");
+		fprint(2, "secstore: directory listing failed.\n");
 		goto Out;
 	}
 
@@ -351,13 +354,13 @@ chpasswd(AuthConn *c, char *id)
 		*next = '\0';
 		if(tokenize(cur, f, nelem(f))< 1)
 			break;
-		fprint(2, "reencrypting '%s'\n", f[0]);
+		fprint(2, "secstore: reencrypting '%s'\n", f[0]);
 		if(getfile(c->conn, f[0], &memfile, &len, (uchar*)c->pass, c->passlen) < 0){
-			fprint(2, "getfile of '%s' failed\n", f[0]);
+			fprint(2, "secstore: getfile of '%s' failed\n", f[0]);
 			continue;
 		}
 		if(putfile(c->conn, f[0], memfile, len, (uchar*)newpass, newpasslen) < 0)
-			fprint(2, "putfile of '%s' failed\n", f[0]);
+			fprint(2, "secstore: putfile of '%s' failed\n", f[0]);
 		free(memfile);
 	}
 	free(list);
@@ -380,10 +383,8 @@ login(char *id, char *dest, int pass_stdin, int pass_nvram)
 	int fd, n, ntry = 0;
 	char *S, *PINSTA = nil, *nl, s[Maxmsg+1], *pass;
 
-	if(dest == nil){
-		fprint(2, "tried to login with nil dest\n");
-		exits("nil dest");
-	}
+	if(dest == nil)
+		sysfatal("tried to login with nil dest");
 	c = emalloc(sizeof(*c));
 	if(pass_nvram){
 		if(readnvram(&nvr, 0) < 0)
@@ -409,7 +410,7 @@ login(char *id, char *dest, int pass_stdin, int pass_nvram)
 		if(verbose)
 			fprint(2, "dialing %s\n", dest);
 		if((fd = dial(dest, nil, nil, nil)) < 0){
-			fprint(2, "can't dial %s\n", dest);
+			fprint(2, "secstore: can't dial %s\n", dest);
 			free(c);
 			return nil;
 		}
@@ -421,7 +422,7 @@ login(char *id, char *dest, int pass_stdin, int pass_nvram)
 		if(!pass_stdin && !pass_nvram){
 			pass = getpassm("secstore password: ");
 			if(strlen(pass) >= sizeof c->pass){
-				fprint(2, "password too long, skipping secstore login\n");
+				fprint(2, "secstore: password too long, skipping secstore login\n");
 				exits("password too long");
 			}
 			strcpy(c->pass, pass);
@@ -429,7 +430,7 @@ login(char *id, char *dest, int pass_stdin, int pass_nvram)
 			free(pass);
 		}
 		if(c->pass[0]==0){
-			fprint(2, "null password, skipping secstore login\n");
+			fprint(2, "secstore: null password, skipping secstore login\n");
 			exits("no password");
 		}
 		if(PAKclient(c->conn, id, c->pass, &S) >= 0)
@@ -548,7 +549,7 @@ main(int argc, char **argv)
 		usage();
 
 	if(chpass && (ngfile || npfile || nrfile)){
-		fprint(2, "Get, put, and remove invalid with password change.\n");
+		fprint(2, "secstore: Get, put, and remove invalid with password change.\n");
 		exits("usage");
 	}
 
@@ -560,19 +561,14 @@ main(int argc, char **argv)
 		snprint(tcpserve, rc, "tcp!%s!5356", serve);
 	c = login(user, tcpserve, pass_stdin, pass_nvram);
 	free(tcpserve);
-	if(c == nil){
-		fprint(2, "secstore authentication failed\n");
-		exits("secstore authentication failed");
-	}
+	if(c == nil)
+		sysfatal("secstore authentication failed");
 	if(chpass)
 		rc = chpasswd(c, user);
 	else
 		rc = cmd(c, gfile, Gflag, pfile, rfile);
-	if(rc < 0){
-		fprint(2, "secstore cmd failed\n");
-		exits("secstore cmd failed");
-	}
+	if(rc < 0)
+		sysfatal("secstore cmd failed");
 	exits("");
 	return 0;
 }
-

+ 2 - 2
sys/src/cmd/auth/secstore/secstored.c

@@ -208,7 +208,7 @@ remoteIP(char *ldir)
 		return strdup("?!?");
 	n = read(fd, ap, sizeof ap);
 	if(n <= 0 || n == sizeof ap){
-		fprint(2, "error %d reading %s: %r\n", n, rp);
+		fprint(2, "secstored: error %d reading %s: %r\n", n, rp);
 		return strdup("?!?");
 	}
 	close(fd);
@@ -234,7 +234,7 @@ dologin(int fd, char *S, int forceSTA)
 	if((conn = newSConn(fd)) == nil)
 		return -1;
 	if(readstr(conn, msg) < 0){
-		fprint(2, "remote: %s: %r\n", msg);
+		fprint(2, "secstored: remote: %s: %r\n", msg);
 		writerr(conn, "can't read your first message");
 		goto Out;
 	}

+ 1 - 1
sys/src/cmd/auth/secstore/secuser.c

@@ -20,7 +20,7 @@ ensure_exists(char *f, ulong perm)
 		fprint(2,"first time setup for secstore: create %s %lo\n", f, perm);
 	fd = create(f, OREAD, perm);
 	if(fd < 0){
-		fprint(2, "unable to create %s\n", f);
+		fprint(2, "secuser: unable to create %s\n", f);
 		exits("secstored directories");
 	}
 	close(fd);

+ 4 - 8
sys/src/cmd/auth/secstore/util.c

@@ -40,15 +40,11 @@ getpassm(char *prompt)
 
 	if(cons == 0){ // first time
 		cons = open("/dev/cons", ORDWR);
-		if(cons < 0){
-			fprint(2, "couldn't open cons\n");
-			exits("no cons");
-		}
+		if(cons < 0)
+			sysfatal("couldn't open cons");
 		consctl = open("/dev/consctl", OWRITE);
-		if(consctl < 0){
-			fprint(2, "couldn't set raw mode\n");
-			exits("no consctl");
-		}
+		if(consctl < 0)
+			sysfatal("couldn't set raw mode via consctl");
 	}
 	fprint(consctl, "rawon");
 	fprint(cons, "%s", prompt);

+ 1 - 1
sys/src/cmd/auth/uniq.c

@@ -58,7 +58,7 @@ main(int argc, char **argv)
 
 		w = malloc(sizeof(Who));
 		if(w == 0){
-			fprint(2, "out of memory\n");
+			fprint(2, "auth/uniq: out of memory\n");
 			exits(0);
 		}
 		memset(w, 0, sizeof(Who));

+ 1 - 2
sys/src/cmd/auth/warning.c

@@ -266,8 +266,7 @@ mail(Fs *f, char *rcvr, char *user, long et)
 	execl("/bin/upas/send", "send", "-r", rcvr, nil);
 
 	/* just in case */
-	fprint(2, "warning can't exec send: %r\n");
-	exits("exec send");
+	sysfatal("can't exec send: %r");
 
 	return 0;		/* for compiler */
 }