Sync with plan 9 for Apr 20th

Reference: /n/patches.lsub.org/patch/plan9-20120420
Date: Mon Apr 23 09:59:34 CES 2012
Signed-off-by: nemo@lsub.org

--- /sys/man/4/ssh	Thu Apr 19 14:57:21 2012
+++ /sys/man/4/ssh	Mon Apr 23 09:10:17 2012
@@ -374,7 +374,7 @@
 can be done by:
 .IP
 .EX
-rsagen >key; read -m key >/mnt/factotum/ctl
+auth/rsagen >key; read -m key >/mnt/factotum/ctl
 .EE
 .LP
 The key file will normally be loaded when
@@ -384,11 +384,9 @@
 or directly in the user's
 .BR lib/profile .
 See
-.IR ssh (4)
+.IR ssh2 (1)
 for
-.I rsa2ssh2
-(see
-.IR ssh2 (1)).
+.IR rsa2ssh2 .
 .LP
 The command
 .IP
--- /sys/src/9/omap/devcons.c	Thu Apr 12 12:25:04 2012
+++ /sys/src/9/omap/devcons.c	Mon Apr 23 09:10:17 2012
@@ -100,8 +100,7 @@
  */
 struct {
 	Lock lk;
-//	char buf[16384];		/* normal */
-	char buf[256*1024];		/* for acpi debugging */
+	char buf[KMESGSIZE];
 	uint n;
 } kmesg;
 
--- /sys/src/cmd/ssh2/dup.out	Thu Apr 19 15:20:25 2012
+++ /sys/src/cmd/ssh2/dup.out	Mon Apr 23 09:10:17 2012
@@ -1,427 +1,407 @@
-#1. 9 ncsl lines
-	9,netssh.c:561,570
-	9,netssh.c:853,861
+#1. 8 ncsl lines
+	6,dial.c:431,438
+	7,dial.thread.c:432,439
+	0 parameters
+
+#2. 16 ncsl lines
+	6,dial.c:14,44
+	7,dial.thread.c:24,49
 	1 parameters
- 	1. dataq,	reqq
+ 	1. pid,	cfd
 
-#2. 44 ncsl lines
-	6,dial.c:500,559
-	7,dial.thread.c:494,553
+#3. 5 ncsl lines
+	9,netssh.c:2215,2220
+	9,netssh.c:2429,2434
 	0 parameters
 
-#3. 3 ncsl lines
-	7,dial.thread.c:274,282
-	7,dial.thread.c:313,317
+#4. 3 ncsl lines
+	9,netssh.c:671,673
+	9,netssh.c:799,801
 	0 parameters
 
-#4. 33 ncsl lines
-	6,dial.c:442,481
-	7,dial.thread.c:443,482
+#5. 3 ncsl lines
+	9,netssh.c:799,801
+	12,ssh.c:241,243
 	0 parameters
 
-#5. 16 ncsl lines
-	9,netssh.c:2595,2611
-	9,netssh.c:2621,2637
-	6 parameters
- 	1. "received KEX algs: %s",	"received C2S crypto algs: %s"
- 	2. kexes,	cryptos
- 	3. foundk,	foundc1
- 	4. "kex algs not in kexes",	"c2s crypto algs not in cryptos"
- 	5. kexalg,	ncscrypt
- 	6. "received host key algs: %s",	"received S2C crypto algs: %s"
+#6. 3 ncsl lines
+	9,netssh.c:799,801
+	9,netssh.c:1707,1709
+	0 parameters
 
-#6. 16 ncsl lines
-	9,netssh.c:2595,2611
-	9,netssh.c:2634,2650
-	6 parameters
- 	1. "received KEX algs: %s",	"received S2C crypto algs: %s"
- 	2. kexes,	cryptos
- 	3. foundk,	foundc2
- 	4. "kex algs not in kexes",	"s2c crypto algs not in cryptos"
- 	5. kexalg,	nsccrypt
- 	6. "received host key algs: %s",	"received C2S MAC algs: %s"
+#7. 3 ncsl lines
+	9,netssh.c:799,801
+	9,netssh.c:976,978
+	0 parameters
 
-#7. 12 ncsl lines
-	9,netssh.c:2693,2705
-	9,netssh.c:2725,2737
-	3 parameters
- 	1. kexes,	cryptos
- 	2. foundk,	foundc2
- 	3. kexalg,	nsccrypt
+#8. 3 ncsl lines
+	9,netssh.c:729,731
+	9,netssh.c:799,801
+	0 parameters
 
-#8. 12 ncsl lines
-	9,netssh.c:2693,2705
-	9,netssh.c:2715,2726
-	3 parameters
- 	1. kexes,	cryptos
- 	2. foundk,	foundc1
- 	3. kexalg,	ncscrypt
+#9. 3 ncsl lines
+	9,netssh.c:385,387
+	9,netssh.c:799,801
+	0 parameters
 
-#9. 4 ncsl lines
-	9,netssh.c:2693,2696
-	9,netssh.c:2747,2750
-	1 parameters
- 	1. kexes,	macnames
+#10. 3 ncsl lines
+	9,netssh.c:799,801
+	9,netssh.c:966,968
+	0 parameters
 
-#10. 4 ncsl lines
-	9,netssh.c:2693,2696
-	9,netssh.c:2736,2739
+#11. 4 ncsl lines
+	9,netssh.c:875,878
+	12,ssh.c:392,396
 	1 parameters
- 	1. kexes,	macnames
-
-#11. 3 ncsl lines
-	9,netssh.c:2673,2675
-	9,netssh.c:2674,2676
-	(overlap; region has 3 nonoverlapping matching 1-ncsl-line segments)
-	0 parameters
+ 	1. threadexits,	bail
 
-#12. 3 ncsl lines
-	9,netssh.c:2674,2676
-	9,netssh.c:2758,2760
-	0 parameters
+#12. 4 ncsl lines
+	9,netssh.c:695,698
+	9,netssh.c:970,973
+	1 parameters
+ 	1. readreqrem,	writereqremproc
 
-#13. 3 ncsl lines
-	9,netssh.c:2673,2675
-	9,netssh.c:2759,2761
-	0 parameters
+#13. 4 ncsl lines
+	9,netssh.c:2326,2329
+	9,netssh.c:2403,2406
+	1 parameters
+ 	1. SSH_MSG_CHANNEL_OPEN_FAILURE,	SSH_MSG_CHANNEL_REQUEST
 
-#14. 3 ncsl lines
-	9,netssh.c:2758,2760
-	9,netssh.c:2759,2761
-	(overlap; region has 3 nonoverlapping matching 1-ncsl-line segments)
-	0 parameters
+#14. 4 ncsl lines
+	9,netssh.c:2317,2320
+	9,netssh.c:2403,2406
+	1 parameters
+ 	1. SSH_MSG_CHANNEL_OPEN_CONFIRMATION,	SSH_MSG_CHANNEL_REQUEST
 
-#15. 9 ncsl lines
-	9,netssh.c:1231,1239
-	9,netssh.c:1441,1449
-	2 parameters
- 	1. Closing,	Closed
- 	2. Closed,	Closing
+#15. 5 ncsl lines
+	9,netssh.c:2365,2369
+	9,netssh.c:2374,2378
+	1 parameters
+ 	1. SSH_MSG_CHANNEL_EOF,	SSH_MSG_CHANNEL_CLOSE
 
 #16. 4 ncsl lines
-	9,netssh.c:1310,1317
-	9,netssh.c:1339,1342
+	9,netssh.c:2326,2329
+	9,netssh.c:2365,2368
 	1 parameters
- 	1. "shell",	"exec"
+ 	1. SSH_MSG_CHANNEL_OPEN_FAILURE,	SSH_MSG_CHANNEL_EOF
 
-#17. 5 ncsl lines
-	6,dial.c:281,285
-	7,dial.thread.c:185,189
-	0 parameters
+#17. 4 ncsl lines
+	9,netssh.c:2317,2320
+	9,netssh.c:2365,2368
+	1 parameters
+ 	1. SSH_MSG_CHANNEL_OPEN_CONFIRMATION,	SSH_MSG_CHANNEL_EOF
 
-#18. 3 ncsl lines
-	12,ssh.c:245,247
-	12,ssh.c:287,289
-	0 parameters
+#18. 4 ncsl lines
+	9,netssh.c:2374,2377
+	9,netssh.c:2403,2406
+	1 parameters
+ 	1. SSH_MSG_CHANNEL_CLOSE,	SSH_MSG_CHANNEL_REQUEST
 
-#19. 8 ncsl lines
-	9,netssh.c:1582,1589
-	9,netssh.c:3160,3167
-	2 parameters
- 	1. e,	x
- 	2. x,	e
+#19. 4 ncsl lines
+	9,netssh.c:2326,2329
+	9,netssh.c:2374,2377
+	1 parameters
+ 	1. SSH_MSG_CHANNEL_OPEN_FAILURE,	SSH_MSG_CHANNEL_CLOSE
 
 #20. 4 ncsl lines
-	9,netssh.c:1586,1589
-	9,netssh.c:3160,3163
+	9,netssh.c:2317,2320
+	9,netssh.c:2374,2377
+	1 parameters
+ 	1. SSH_MSG_CHANNEL_OPEN_CONFIRMATION,	SSH_MSG_CHANNEL_CLOSE
+
+#21. 3 ncsl lines
+	12,ssh.c:530,532
+	13,sshsession.c:215,217
 	0 parameters
 
-#21. 4 ncsl lines
-	9,netssh.c:1582,1585
-	9,netssh.c:1586,1589
-	1 parameters
- 	1. e,	x
+#22. 3 ncsl lines
+	9,netssh.c:190,192
+	12,ssh.c:530,532
+	0 parameters
 
-#22. 4 ncsl lines
-	9,netssh.c:1003,1006
-	9,netssh.c:1012,1015
-	1 parameters
- 	1. authkey,	password
+#23. 6 ncsl lines
+	9,netssh.c:726,731
+	9,netssh.c:973,978
+	0 parameters
 
-#23. 4 ncsl lines
-	9,netssh.c:3160,3163
-	9,netssh.c:3164,3167
-	1 parameters
- 	1. x,	e
+#24. 12 ncsl lines
+	9,netssh.c:183,194
+	13,sshsession.c:208,219
+	4 parameters
+ 	1. mntpt,	shell
+ 	2. 's',	'S'
+ 	3. 'v',	't'
+ 	4. nokeyverify,	tflag
+
+#25. 5 ncsl lines
+	6,dial.c:281,285
+	7,dial.thread.c:185,189
+	0 parameters
 
-#24. 4 ncsl lines
-	9,netssh.c:1582,1585
-	9,netssh.c:3164,3167
+#26. 3 ncsl lines
+	12,ssh.c:268,270
+	12,ssh.c:310,312
 	0 parameters
 
-#25. 9 ncsl lines
+#27. 9 ncsl lines
 	9,netssh.c:159,168
 	11,rsa2ssh2.c:15,24
 	2 parameters
  	1. "usage: %s [-dkv] [-m mntpt] [-s srvpt]\n",	"usage: %s [file]\n"
  	2. threadmain,	main
 
-#26. 3 ncsl lines
+#28. 3 ncsl lines
 	9,netssh.c:159,161
 	12,ssh.c:24,26
 	0 parameters
 
-#27. 3 ncsl lines
+#29. 3 ncsl lines
 	9,netssh.c:159,161
 	13,sshsession.c:26,28
 	0 parameters
 
-#28. 6 ncsl lines
-	9,netssh.c:3185,3190
-	9,netssh.c:3191,3196
-	1 parameters
- 	1. dataq,	reqq
-
-#29. 3 ncsl lines
-	9,netssh.c:1865,1867
-	9,netssh.c:1897,1899
+#30. 3 ncsl lines
+	7,dial.thread.c:274,282
+	7,dial.thread.c:313,317
 	0 parameters
 
-#30. 4 ncsl lines
-	5,dh.c:259,263
-	5,dh.c:320,324
-	1 parameters
- 	1. nbit,	1024
-
-#31. 6 ncsl lines
-	9,netssh.c:2142,2147
-	9,netssh.c:2185,2190
-	2 parameters
- 	1. SSH_DISCONNECT_KEY_EXCHANGE_FAILED,	SSH_DISCONNECT_SERVICE_NOT_AVAILABLE
- 	2. "Key exchange failure",	"Unknown service type"
+#31. 3 ncsl lines
+	9,netssh.c:1150,1152
+	9,netssh.c:1452,1454
+	0 parameters
 
 #32. 3 ncsl lines
-	9,netssh.c:1324,1326
-	9,netssh.c:1325,1327
-	(overlap; region has 3 nonoverlapping matching 1-ncsl-line segments)
+	9,netssh.c:1150,1152
+	9,netssh.c:1191,1193
 	0 parameters
 
 #33. 3 ncsl lines
-	6,dial.c:331,333
-	7,dial.thread.c:113,115
+	9,netssh.c:1150,1152
+	9,netssh.c:1498,1500
 	0 parameters
 
 #34. 3 ncsl lines
-	6,dial.c:97,99
-	6,dial.c:331,333
+	9,netssh.c:1150,1152
+	9,netssh.c:1241,1243
 	0 parameters
 
-#35. 4 ncsl lines
-	9,netssh.c:132,136
-	9,netssh.c:151,155
-	1 parameters
- 	1. "ssh",	"sshdebug"
+#35. 44 ncsl lines
+	6,dial.c:500,559
+	7,dial.thread.c:494,553
+	0 parameters
 
 #36. 3 ncsl lines
-	8,esmprint.c:10,12
-	9,netssh.c:151,153
+	9,netssh.c:1788,1790
+	9,netssh.c:1795,1797
 	0 parameters
 
 #37. 3 ncsl lines
-	9,netssh.c:596,599
-	9,netssh.c:1524,1527
+	9,netssh.c:1871,1873
+	9,netssh.c:1903,1905
 	0 parameters
 
-#38. 4 ncsl lines
-	9,netssh.c:687,690
-	9,netssh.c:718,721
+#38. 33 ncsl lines
+	6,dial.c:442,481
+	7,dial.thread.c:443,482
 	0 parameters
 
-#39. 4 ncsl lines
-	9,netssh.c:379,382
-	9,netssh.c:723,726
-	0 parameters
+#39. 8 ncsl lines
+	9,netssh.c:2088,2095
+	9,netssh.c:2250,2257
+	1 parameters
+ 	1. SSH_MSG_NEWKEYS,	SSH_MSG_IGNORE
 
-#40. 4 ncsl lines
-	9,netssh.c:379,382
-	9,netssh.c:970,973
+#40. 6 ncsl lines
+	9,netssh.c:2250,2255
+	9,netssh.c:2525,2530
 	0 parameters
 
 #41. 4 ncsl lines
-	9,netssh.c:379,382
-	9,netssh.c:960,963
-	1 parameters
- 	1. nil,	"deferredinit failed"
-
-#42. 4 ncsl lines
-	9,netssh.c:379,382
-	9,netssh.c:665,668
+	9,netssh.c:132,136
+	9,netssh.c:151,155
 	1 parameters
- 	1. nil,	"deferredinit failed"
-
-#43. 3 ncsl lines
-	9,netssh.c:379,381
-	9,netssh.c:836,838
-	0 parameters
-
-#44. 3 ncsl lines
-	9,netssh.c:379,381
-	9,netssh.c:954,956
-	0 parameters
-
-#45. 3 ncsl lines
-	9,netssh.c:379,381
-	9,netssh.c:650,652
-	0 parameters
-
-#46. 3 ncsl lines
-	9,netssh.c:379,381
-	9,netssh.c:628,630
-	0 parameters
-
-#47. 3 ncsl lines
-	9,netssh.c:379,381
-	9,netssh.c:658,660
-	0 parameters
-
-#48. 3 ncsl lines
-	9,netssh.c:379,381
-	9,netssh.c:671,673
-	0 parameters
+ 	1. "ssh",	"sshdebug"
 
-#49. 3 ncsl lines
-	9,netssh.c:379,381
-	9,netssh.c:869,871
+#42. 3 ncsl lines
+	8,esmprint.c:10,12
+	9,netssh.c:151,153
 	0 parameters
 
-#50. 3 ncsl lines
-	9,netssh.c:550,552
-	9,netssh.c:918,920
+#43. 3 ncsl lines
+	9,netssh.c:601,604
+	9,netssh.c:1530,1533
 	0 parameters
 
-#51. 3 ncsl lines
-	9,netssh.c:550,552
-	9,netssh.c:900,902
+#44. 4 ncsl lines
+	9,netssh.c:692,695
+	9,netssh.c:723,726
 	0 parameters
 
-#52. 5 ncsl lines
+#45. 5 ncsl lines
 	5,dh.c:280,284
 	5,dh.c:418,422
 	0 parameters
 
-#53. 4 ncsl lines
+#46. 4 ncsl lines
 	5,dh.c:154,157
 	5,dh.c:187,190
 	1 parameters
  	1. "no proto=dsa key in factotum",	"no key (y) found"
 
-#54. 4 ncsl lines
+#47. 4 ncsl lines
 	5,dh.c:154,157
 	5,dh.c:180,183
 	1 parameters
  	1. "no proto=dsa key in factotum",	"no key (g) found"
 
-#55. 4 ncsl lines
+#48. 4 ncsl lines
 	5,dh.c:154,157
 	5,dh.c:173,176
 	1 parameters
  	1. "no proto=dsa key in factotum",	"no key (q) found"
 
-#56. 4 ncsl lines
+#49. 4 ncsl lines
 	5,dh.c:99,102
 	5,dh.c:154,157
 	1 parameters
  	1. "no key (n) found",	"no proto=dsa key in factotum"
 
-#57. 4 ncsl lines
+#50. 4 ncsl lines
 	5,dh.c:154,157
 	5,dh.c:166,169
 	1 parameters
  	1. "no proto=dsa key in factotum",	"no key (p) found"
 
-#58. 4 ncsl lines
+#51. 4 ncsl lines
 	5,dh.c:154,157
 	5,dh.c:198,201
 	1 parameters
  	1. "no proto=dsa key in factotum",	"no key (x) found"
 
-#59. 4 ncsl lines
+#52. 4 ncsl lines
 	5,dh.c:108,111
 	5,dh.c:154,157
 	1 parameters
  	1. "no key (ek) found",	"no proto=dsa key in factotum"
 
-#60. 7 ncsl lines
-	9,netssh.c:662,668
-	9,netssh.c:957,963
+#53. 3 ncsl lines
+	9,netssh.c:555,557
+	9,netssh.c:923,925
 	0 parameters
 
-#61. 7 ncsl lines
-	5,dh.c:81,88
-	5,dh.c:147,154
-	2 parameters
- 	1. "proto=rsa",	"proto=dsa"
- 	2. "no proto=rsa key in factotum",	"no proto=dsa key in factotum"
+#54. 3 ncsl lines
+	9,netssh.c:555,557
+	9,netssh.c:905,907
+	0 parameters
+
+#55. 4 ncsl lines
+	9,netssh.c:384,387
+	9,netssh.c:728,731
+	0 parameters
+
+#56. 4 ncsl lines
+	9,netssh.c:384,387
+	9,netssh.c:975,978
+	0 parameters
 
-#62. 4 ncsl lines
-	12,ssh.c:398,401
-	12,ssh.c:417,420
+#57. 4 ncsl lines
+	9,netssh.c:384,387
+	9,netssh.c:670,673
 	1 parameters
- 	1. cfd1,	cfd2
+ 	1. nil,	"deferredinit failed"
 
-#63. 4 ncsl lines
-	9,netssh.c:516,519
-	9,netssh.c:841,844
+#58. 4 ncsl lines
+	9,netssh.c:384,387
+	9,netssh.c:965,968
+	1 parameters
+ 	1. nil,	"deferredinit failed"
+
+#59. 3 ncsl lines
+	9,netssh.c:384,386
+	9,netssh.c:841,843
+	0 parameters
+
+#60. 3 ncsl lines
+	9,netssh.c:384,386
+	9,netssh.c:959,961
+	0 parameters
+
+#61. 3 ncsl lines
+	9,netssh.c:384,386
+	9,netssh.c:874,876
+	0 parameters
+
+#62. 3 ncsl lines
+	9,netssh.c:384,386
+	9,netssh.c:663,665
+	0 parameters
+
+#63. 3 ncsl lines
+	9,netssh.c:384,386
+	9,netssh.c:676,678
 	0 parameters
 
-#64. 4 ncsl lines
-	9,netssh.c:841,844
-	9,netssh.c:910,913
+#64. 3 ncsl lines
+	9,netssh.c:384,386
+	9,netssh.c:655,657
 	0 parameters
 
 #65. 3 ncsl lines
-	9,netssh.c:387,389
-	9,netssh.c:806,808
+	9,netssh.c:384,386
+	9,netssh.c:633,635
 	0 parameters
 
-#66. 4 ncsl lines
-	9,netssh.c:797,800
-	9,netssh.c:828,831
-	1 parameters
- 	1. Connection,	Subchannel
+#66. 6 ncsl lines
+	9,netssh.c:2148,2153
+	9,netssh.c:2191,2196
+	2 parameters
+ 	1. SSH_DISCONNECT_KEY_EXCHANGE_FAILED,	SSH_DISCONNECT_SERVICE_NOT_AVAILABLE
+ 	2. "Key exchange failure",	"Unknown service type"
 
-#67. 4 ncsl lines
-	9,netssh.c:758,761
-	9,netssh.c:868,871
-	1 parameters
- 	1. "Key file collision",	nil
+#67. 3 ncsl lines
+	9,netssh.c:1329,1331
+	9,netssh.c:1330,1332
+	(overlap; region has 3 nonoverlapping matching 1-ncsl-line segments)
+	0 parameters
 
-#68. 4 ncsl lines
-	9,netssh.c:835,838
-	9,netssh.c:868,871
+#68. 3 ncsl lines
+	6,dial.c:331,333
+	7,dial.thread.c:113,115
 	0 parameters
 
 #69. 3 ncsl lines
-	9,netssh.c:828,830
-	9,netssh.c:868,870
+	6,dial.c:97,99
+	6,dial.c:331,333
 	0 parameters
 
-#70. 3 ncsl lines
-	9,netssh.c:797,799
-	9,netssh.c:835,837
-	0 parameters
+#70. 4 ncsl lines
+	5,dh.c:259,263
+	5,dh.c:320,324
+	1 parameters
+ 	1. nbit,	1024
 
-#71. 6 ncsl lines
-	9,netssh.c:2351,2356
-	9,netssh.c:2412,2417
-	2 parameters
+#71. 9 ncsl lines
+	9,netssh.c:566,575
+	9,netssh.c:858,866
+	1 parameters
  	1. dataq,	reqq
- 	2. datatl,	reqtl
 
-#72. 6 ncsl lines
-	9,netssh.c:1721,1726
-	9,netssh.c:1908,1913
+#72. 4 ncsl lines
+	12,ssh.c:421,424
+	12,ssh.c:440,443
 	1 parameters
- 	1. remfd,	fd
+ 	1. cfd1,	cfd2
 
-#73. 3 ncsl lines
-	6,dial.c:275,278
-	9,netssh.c:2425,2428
-	0 parameters
+#73. 7 ncsl lines
+	5,dh.c:81,88
+	5,dh.c:147,154
+	2 parameters
+ 	1. "proto=rsa",	"proto=dsa"
+ 	2. "no proto=rsa key in factotum",	"no proto=dsa key in factotum"
 
 #74. 3 ncsl lines
-	6,dial.c:141,144
-	9,netssh.c:2425,2428
+	6,dial.c:275,278
+	9,netssh.c:2431,2434
 	0 parameters
 
 #75. 3 ncsl lines
@@ -430,421 +410,521 @@
 	0 parameters
 
 #76. 3 ncsl lines
-	6,dial.c:141,144
+	7,dial.thread.c:177,180
 	13,sshsession.c:147,150
 	0 parameters
 
 #77. 3 ncsl lines
 	7,dial.thread.c:177,180
-	13,sshsession.c:147,150
+	9,netssh.c:2431,2434
 	0 parameters
 
-#78. 3 ncsl lines
-	7,dial.thread.c:177,180
-	9,netssh.c:2425,2428
-	0 parameters
+#78. 10 ncsl lines
+	0,cipher3des.c:28,39
+	2,cipherblowfish.c:42,53
+	3 parameters
+ 	1. encrypt3des,	encryptblowfish
+ 	2. des3CBCencrypt,	bfCBCencrypt
+ 	3. decrypt3des,	decryptblowfish
 
-#79. 3 ncsl lines
-	5,dh.c:795,798
-	9,netssh.c:2211,2214
-	0 parameters
+#79. 5 ncsl lines
+	0,cipher3des.c:28,33
+	3,cipherrc4.c:24,29
+	1 parameters
+ 	1. encrypt3des,	encryptrc4
 
 #80. 3 ncsl lines
 	5,dh.c:795,798
-	13,sshsession.c:147,150
+	9,netssh.c:2217,2220
 	0 parameters
 
 #81. 3 ncsl lines
-	5,dh.c:795,798
-	9,netssh.c:2425,2428
+	7,dial.thread.c:177,180
+	9,netssh.c:2217,2220
 	0 parameters
 
 #82. 3 ncsl lines
-	5,dh.c:795,798
-	7,dial.thread.c:177,180
+	6,dial.c:275,278
+	9,netssh.c:2217,2220
 	0 parameters
 
 #83. 3 ncsl lines
 	5,dh.c:795,798
-	6,dial.c:275,278
+	13,sshsession.c:147,150
 	0 parameters
 
 #84. 3 ncsl lines
 	5,dh.c:795,798
-	6,dial.c:141,144
+	9,netssh.c:2431,2434
 	0 parameters
 
 #85. 3 ncsl lines
+	5,dh.c:795,798
 	7,dial.thread.c:177,180
-	9,netssh.c:2211,2214
 	0 parameters
 
 #86. 3 ncsl lines
+	5,dh.c:795,798
 	6,dial.c:275,278
-	9,netssh.c:2211,2214
 	0 parameters
 
 #87. 3 ncsl lines
 	6,dial.c:141,144
-	9,netssh.c:2211,2214
+	9,netssh.c:2217,2220
 	0 parameters
 
-#88. 10 ncsl lines
-	0,cipher3des.c:28,39
-	2,cipherblowfish.c:42,53
-	3 parameters
- 	1. encrypt3des,	encryptblowfish
- 	2. des3CBCencrypt,	bfCBCencrypt
- 	3. decrypt3des,	decryptblowfish
-
-#89. 5 ncsl lines
-	0,cipher3des.c:28,33
-	3,cipherrc4.c:24,29
-	1 parameters
- 	1. encrypt3des,	encryptrc4
+#88. 3 ncsl lines
+	6,dial.c:141,144
+	13,sshsession.c:147,150
+	0 parameters
 
-#90. 8 ncsl lines
-	13,sshsession.c:59,66
-	13,sshsession.c:105,112
-	3 parameters
- 	1. name,	p
- 	2. OREAD,	ORDWR
- 	3. "open data",	"open"
+#89. 3 ncsl lines
+	6,dial.c:141,144
+	9,netssh.c:2431,2434
+	0 parameters
 
-#91. 3 ncsl lines
-	9,netssh.c:328,330
-	9,netssh.c:722,724
+#90. 3 ncsl lines
+	5,dh.c:795,798
+	6,dial.c:141,144
 	0 parameters
 
-#92. 3 ncsl lines
-	9,netssh.c:328,330
-	9,netssh.c:969,971
+#91. 8 ncsl lines
+	9,netssh.c:1588,1595
+	9,netssh.c:3166,3173
+	2 parameters
+ 	1. e,	x
+ 	2. x,	e
+
+#92. 4 ncsl lines
+	9,netssh.c:1588,1591
+	9,netssh.c:3170,3173
 	0 parameters
 
 #93. 4 ncsl lines
-	9,netssh.c:602,605
-	9,netssh.c:1410,1413
+	9,netssh.c:3166,3169
+	9,netssh.c:3170,3173
 	1 parameters
- 	1. xconn,	chnum
-
-#94. 11 ncsl lines
-	9,netssh.c:879,890
-	9,netssh.c:1367,1378
-	4 parameters
- 	1. sc,	ch
- 	2. cnum,	n
- 	3. "readdata",	"writedataproc"
- 	4. "bad connection",	"Invalid connection"
+ 	1. x,	e
 
-#95. 3 ncsl lines
-	9,netssh.c:732,734
-	9,netssh.c:878,880
+#94. 4 ncsl lines
+	9,netssh.c:1592,1595
+	9,netssh.c:3166,3169
 	0 parameters
 
-#96. 6 ncsl lines
-	9,netssh.c:2262,2267
-	9,netssh.c:2502,2507
+#95. 4 ncsl lines
+	9,netssh.c:1588,1591
+	9,netssh.c:1592,1595
 	1 parameters
- 	1. "kex crypto algorithm mismatch (Established)",	"kex crypto algorithm mismatch (Initting)"
-
-#97. 4 ncsl lines
-	6,dial.c:357,361
-	7,dial.thread.c:361,365
-	0 parameters
+ 	1. e,	x
 
-#98. 4 ncsl lines
-	6,dial.c:90,93
-	6,dial.c:100,103
+#96. 4 ncsl lines
+	9,netssh.c:1008,1011
+	9,netssh.c:1017,1020
 	1 parameters
- 	1. "/net",	"/net.alt"
+ 	1. authkey,	password
+
+#97. 9 ncsl lines
+	9,netssh.c:1236,1244
+	9,netssh.c:1447,1455
+	2 parameters
+ 	1. Closing,	Closed
+ 	2. Closed,	Closing
+
+#98. 6 ncsl lines
+	9,netssh.c:2357,2362
+	9,netssh.c:2418,2423
+	2 parameters
+ 	1. dataq,	reqq
+ 	2. datatl,	reqtl
 
 #99. 4 ncsl lines
-	6,dial.c:100,103
-	7,dial.thread.c:106,109
-	1 parameters
- 	1. "/net.alt",	"/net"
+	9,netssh.c:521,524
+	9,netssh.c:846,849
+	0 parameters
 
 #100. 4 ncsl lines
-	6,dial.c:90,93
-	7,dial.thread.c:116,119
-	1 parameters
- 	1. "/net",	"/net.alt"
-
-#101. 4 ncsl lines
-	7,dial.thread.c:106,109
-	7,dial.thread.c:116,119
-	1 parameters
- 	1. "/net",	"/net.alt"
+	9,netssh.c:846,849
+	9,netssh.c:915,918
+	0 parameters
 
-#102. 3 ncsl lines
-	9,netssh.c:2072,2074
-	9,netssh.c:2206,2208
+#101. 3 ncsl lines
+	9,netssh.c:392,394
+	9,netssh.c:811,813
 	0 parameters
 
-#103. 4 ncsl lines
-	9,netssh.c:2132,2135
-	9,netssh.c:2539,2542
+#102. 4 ncsl lines
+	9,netssh.c:763,766
+	9,netssh.c:873,876
 	1 parameters
- 	1. SSH_MSG_KEXDH_INIT,	SSH_MSG_USERAUTH_SUCCESS
+ 	1. "Key file collision",	nil
+
+#103. 4 ncsl lines
+	9,netssh.c:840,843
+	9,netssh.c:873,876
+	0 parameters
 
 #104. 4 ncsl lines
-	9,netssh.c:2132,2135
-	9,netssh.c:2166,2169
+	9,netssh.c:802,805
+	9,netssh.c:833,836
 	1 parameters
- 	1. SSH_MSG_KEXDH_INIT,	SSH_MSG_SERVICE_REQUEST
+ 	1. Connection,	Subchannel
 
-#105. 6 ncsl lines
-	9,netssh.c:1224,1229
-	9,netssh.c:1481,1486
-	1 parameters
- 	1. ch,	sc
+#105. 3 ncsl lines
+	9,netssh.c:802,804
+	9,netssh.c:840,842
+	0 parameters
 
 #106. 3 ncsl lines
-	9,netssh.c:1224,1226
-	9,netssh.c:2324,2326
+	9,netssh.c:833,835
+	9,netssh.c:873,875
 	0 parameters
 
-#107. 6 ncsl lines
-	9,netssh.c:2310,2315
-	9,netssh.c:2319,2324
+#107. 4 ncsl lines
+	9,netssh.c:1315,1322
+	9,netssh.c:1344,1347
 	1 parameters
- 	1. SSH_MSG_CHANNEL_OPEN_CONFIRMATION,	SSH_MSG_CHANNEL_OPEN_FAILURE
+ 	1. "shell",	"exec"
 
 #108. 3 ncsl lines
-	9,netssh.c:2449,2451
-	14,transport.c:189,191
+	9,netssh.c:737,739
+	9,netssh.c:883,885
 	0 parameters
 
-#109. 5 ncsl lines
-	9,netssh.c:619,623
-	9,netssh.c:750,754
+#109. 4 ncsl lines
+	9,netssh.c:607,610
+	9,netssh.c:1416,1419
+	1 parameters
+ 	1. xconn,	chnum
+
+#110. 11 ncsl lines
+	9,netssh.c:884,895
+	9,netssh.c:1373,1384
+	4 parameters
+ 	1. sc,	ch
+ 	2. cnum,	n
+ 	3. "readdata",	"writedataproc"
+ 	4. "bad connection",	"Invalid connection"
+
+#111. 8 ncsl lines
+	13,sshsession.c:59,66
+	13,sshsession.c:105,112
+	3 parameters
+ 	1. name,	p
+ 	2. OREAD,	ORDWR
+ 	3. "open data",	"open"
+
+#112. 3 ncsl lines
+	9,netssh.c:333,335
+	9,netssh.c:727,729
 	0 parameters
 
-#110. 4 ncsl lines
-	9,netssh.c:137,141
-	9,netssh.c:155,159
+#113. 3 ncsl lines
+	9,netssh.c:333,335
+	9,netssh.c:974,976
 	0 parameters
 
-#111. 3 ncsl lines
-	9,netssh.c:904,906
-	9,netssh.c:922,924
+#114. 12 ncsl lines
+	9,netssh.c:2699,2711
+	9,netssh.c:2731,2743
+	3 parameters
+ 	1. kexes,	cryptos
+ 	2. foundk,	foundc2
+ 	3. kexalg,	nsccrypt
+
+#115. 12 ncsl lines
+	9,netssh.c:2699,2711
+	9,netssh.c:2721,2732
+	3 parameters
+ 	1. kexes,	cryptos
+ 	2. foundk,	foundc1
+ 	3. kexalg,	ncscrypt
+
+#116. 4 ncsl lines
+	9,netssh.c:2699,2702
+	9,netssh.c:2753,2756
+	1 parameters
+ 	1. kexes,	macnames
+
+#117. 4 ncsl lines
+	9,netssh.c:2699,2702
+	9,netssh.c:2742,2745
+	1 parameters
+ 	1. kexes,	macnames
+
+#118. 3 ncsl lines
+	9,netssh.c:2680,2682
+	9,netssh.c:2764,2766
 	0 parameters
 
-#112. 35 ncsl lines
-	5,dh.c:826,868
-	5,dh.c:835,877
-	(overlap; region has 5 nonoverlapping matching 7-ncsl-line segments)
-	10 parameters
- 	1. 'A',	'B'
- 	2. nc2siv,	ns2civ
- 	3. 'B',	'C'
- 	4. ns2civ,	nc2sek
- 	5. 'C',	'D'
- 	6. nc2sek,	ns2cek
- 	7. 'D',	'E'
- 	8. ns2cek,	nc2sik
- 	9. 'E',	'F'
- 	10. nc2sik,	ns2cik
+#119. 3 ncsl lines
+	9,netssh.c:2764,2766
+	9,netssh.c:2765,2767
+	(overlap; region has 3 nonoverlapping matching 1-ncsl-line segments)
+	0 parameters
 
-#113. 28 ncsl lines
-	5,dh.c:826,859
-	5,dh.c:844,877
-	(overlap; region has 2 nonoverlapping matching 14-ncsl-line segments)
-	8 parameters
- 	1. 'A',	'C'
- 	2. nc2siv,	nc2sek
- 	3. 'B',	'D'
- 	4. ns2civ,	ns2cek
- 	5. 'C',	'E'
- 	6. nc2sek,	nc2sik
- 	7. 'D',	'F'
- 	8. ns2cek,	ns2cik
+#120. 3 ncsl lines
+	9,netssh.c:2679,2681
+	9,netssh.c:2680,2682
+	(overlap; region has 3 nonoverlapping matching 1-ncsl-line segments)
+	0 parameters
 
-#114. 21 ncsl lines
-	5,dh.c:826,850
-	5,dh.c:853,877
+#121. 3 ncsl lines
+	9,netssh.c:2679,2681
+	9,netssh.c:2765,2767
+	0 parameters
+
+#122. 16 ncsl lines
+	9,netssh.c:2601,2617
+	9,netssh.c:2627,2643
 	6 parameters
- 	1. 'A',	'D'
- 	2. nc2siv,	ns2cek
- 	3. 'B',	'E'
- 	4. ns2civ,	nc2sik
- 	5. 'C',	'F'
- 	6. nc2sek,	ns2cik
+ 	1. "received KEX algs: %s",	"received C2S crypto algs: %s"
+ 	2. kexes,	cryptos
+ 	3. foundk,	foundc1
+ 	4. "kex algs not in kexes",	"c2s crypto algs not in cryptos"
+ 	5. kexalg,	ncscrypt
+ 	6. "received host key algs: %s",	"received S2C crypto algs: %s"
 
-#115. 14 ncsl lines
-	5,dh.c:826,841
-	5,dh.c:862,877
-	4 parameters
- 	1. 'A',	'E'
- 	2. nc2siv,	nc2sik
- 	3. 'B',	'F'
- 	4. ns2civ,	ns2cik
+#123. 16 ncsl lines
+	9,netssh.c:2601,2617
+	9,netssh.c:2640,2656
+	6 parameters
+ 	1. "received KEX algs: %s",	"received S2C crypto algs: %s"
+ 	2. kexes,	cryptos
+ 	3. foundk,	foundc2
+ 	4. "kex algs not in kexes",	"s2c crypto algs not in cryptos"
+ 	5. kexalg,	nsccrypt
+ 	6. "received host key algs: %s",	"received C2S MAC algs: %s"
 
-#116. 7 ncsl lines
-	5,dh.c:826,832
-	5,dh.c:871,877
-	2 parameters
- 	1. 'A',	'F'
- 	2. nc2siv,	ns2cik
+#124. 7 ncsl lines
+	9,netssh.c:667,673
+	9,netssh.c:962,968
+	0 parameters
+
+#125. 6 ncsl lines
+	9,netssh.c:1727,1732
+	9,netssh.c:1914,1919
+	1 parameters
+ 	1. remfd,	fd
+
+#126. 6 ncsl lines
+	9,netssh.c:2268,2273
+	9,netssh.c:2508,2513
+	1 parameters
+ 	1. "kex crypto algorithm mismatch (Established)",	"kex crypto algorithm mismatch (Initting)"
+
+#127. 6 ncsl lines
+	9,netssh.c:3191,3196
+	9,netssh.c:3197,3202
+	1 parameters
+ 	1. dataq,	reqq
+
+#128. 3 ncsl lines
+	9,netssh.c:2455,2457
+	14,transport.c:189,191
+	0 parameters
 
-#117. 15 ncsl lines
+#129. 5 ncsl lines
+	9,netssh.c:624,628
+	9,netssh.c:755,759
+	0 parameters
+
+#130. 15 ncsl lines
 	0,cipher3des.c:1,17
 	3,cipherrc4.c:1,17
 	2 parameters
  	1. DES3state,	RC4state
  	2. init3des,	initrc4
 
-#118. 14 ncsl lines
+#131. 14 ncsl lines
 	2,cipherblowfish.c:1,16
 	3,cipherrc4.c:1,16
 	2 parameters
  	1. BFstate,	RC4state
  	2. initblowfish,	initrc4
 
-#119. 14 ncsl lines
+#132. 14 ncsl lines
 	0,cipher3des.c:1,16
 	2,cipherblowfish.c:1,16
 	2 parameters
  	1. DES3state,	BFstate
  	2. init3des,	initblowfish
 
-#120. 8 ncsl lines
-	0,cipher3des.c:1,8
+#133. 8 ncsl lines
 	1,cipheraes.c:1,8
+	2,cipherblowfish.c:1,8
 	0 parameters
 
-#121. 8 ncsl lines
+#134. 8 ncsl lines
 	1,cipheraes.c:1,8
 	3,cipherrc4.c:1,8
 	0 parameters
 
-#122. 8 ncsl lines
+#135. 8 ncsl lines
+	0,cipher3des.c:1,8
 	1,cipheraes.c:1,8
-	2,cipherblowfish.c:1,8
 	0 parameters
 
-#123. 8 ncsl lines
+#136. 8 ncsl lines
 	11,rsa2ssh2.c:1,8
 	14,transport.c:1,8
 	2 parameters
  	1. auth,	libsec
  	2. authsrv,	ip
 
-#124. 7 ncsl lines
+#137. 7 ncsl lines
 	1,cipheraes.c:1,7
 	14,transport.c:1,7
 	0 parameters
 
-#125. 7 ncsl lines
-	0,cipher3des.c:1,7
+#138. 7 ncsl lines
+	2,cipherblowfish.c:1,7
 	14,transport.c:1,7
 	0 parameters
 
-#126. 7 ncsl lines
+#139. 7 ncsl lines
 	3,cipherrc4.c:1,7
 	14,transport.c:1,7
 	0 parameters
 
-#127. 7 ncsl lines
-	2,cipherblowfish.c:1,7
+#140. 7 ncsl lines
+	0,cipher3des.c:1,7
 	14,transport.c:1,7
 	0 parameters
 
-#128. 7 ncsl lines
+#141. 7 ncsl lines
 	1,cipheraes.c:1,7
 	11,rsa2ssh2.c:1,7
 	1 parameters
  	1. libsec,	auth
 
-#129. 7 ncsl lines
-	0,cipher3des.c:1,7
+#142. 7 ncsl lines
+	2,cipherblowfish.c:1,7
 	11,rsa2ssh2.c:1,7
 	1 parameters
  	1. libsec,	auth
 
-#130. 7 ncsl lines
+#143. 7 ncsl lines
 	3,cipherrc4.c:1,7
 	11,rsa2ssh2.c:1,7
 	1 parameters
  	1. libsec,	auth
 
-#131. 7 ncsl lines
-	2,cipherblowfish.c:1,7
+#144. 7 ncsl lines
+	0,cipher3des.c:1,7
 	11,rsa2ssh2.c:1,7
 	1 parameters
  	1. libsec,	auth
 
-#132. 6 ncsl lines
-	2,cipherblowfish.c:1,6
+#145. 6 ncsl lines
+	0,cipher3des.c:1,6
 	7,dial.thread.c:4,9
 	1 parameters
  	1. mp,	ctype
 
-#133. 6 ncsl lines
+#146. 6 ncsl lines
 	3,cipherrc4.c:1,6
 	7,dial.thread.c:4,9
 	1 parameters
  	1. mp,	ctype
 
-#134. 6 ncsl lines
-	0,cipher3des.c:1,6
+#147. 6 ncsl lines
+	2,cipherblowfish.c:1,6
 	7,dial.thread.c:4,9
 	1 parameters
  	1. mp,	ctype
 
-#135. 6 ncsl lines
+#148. 6 ncsl lines
 	1,cipheraes.c:1,6
 	7,dial.thread.c:4,9
 	1 parameters
  	1. mp,	ctype
 
-#136. 6 ncsl lines
+#149. 6 ncsl lines
 	7,dial.thread.c:4,9
 	14,transport.c:1,6
 	1 parameters
  	1. ctype,	mp
 
-#137. 6 ncsl lines
+#150. 6 ncsl lines
 	7,dial.thread.c:4,9
 	11,rsa2ssh2.c:1,6
 	1 parameters
  	1. ctype,	mp
 
-#138. 3 ncsl lines
+#151. 3 ncsl lines
 	6,dial.c:4,6
 	7,dial.thread.c:4,6
 	0 parameters
 
-#139. 6 ncsl lines
-	5,dh.c:164,169
-	5,dh.c:178,183
-	2 parameters
- 	1. " p=",	" alpha="
- 	2. "no key (p) found",	"no key (g) found"
-
-#140. 6 ncsl lines
-	5,dh.c:164,169
-	5,dh.c:171,176
-	2 parameters
- 	1. " p=",	" q="
- 	2. "no key (p) found",	"no key (q) found"
-
-#141. 6 ncsl lines
-	5,dh.c:164,169
-	5,dh.c:185,190
-	2 parameters
- 	1. " p=",	" key="
- 	2. "no key (p) found",	"no key (y) found"
+#152. 4 ncsl lines
+	9,netssh.c:137,141
+	9,netssh.c:155,159
+	0 parameters
 
-#142. 6 ncsl lines
-	5,dh.c:97,102
-	5,dh.c:106,111
-	2 parameters
- 	1. " n=",	" ek="
- 	2. "no key (n) found",	"no key (ek) found"
+#153. 3 ncsl lines
+	9,netssh.c:909,911
+	9,netssh.c:927,929
+	0 parameters
 
-#143. 14 ncsl lines
-	1,cipheraes.c:69,83
+#154. 35 ncsl lines
+	5,dh.c:826,868
+	5,dh.c:835,877
+	(overlap; region has 5 nonoverlapping matching 7-ncsl-line segments)
+	10 parameters
+ 	1. 'A',	'B'
+ 	2. nc2siv,	ns2civ
+ 	3. 'B',	'C'
+ 	4. ns2civ,	nc2sek
+ 	5. 'C',	'D'
+ 	6. nc2sek,	ns2cek
+ 	7. 'D',	'E'
+ 	8. ns2cek,	nc2sik
+ 	9. 'E',	'F'
+ 	10. nc2sik,	ns2cik
+
+#155. 28 ncsl lines
+	5,dh.c:826,859
+	5,dh.c:844,877
+	(overlap; region has 2 nonoverlapping matching 14-ncsl-line segments)
+	8 parameters
+ 	1. 'A',	'C'
+ 	2. nc2siv,	nc2sek
+ 	3. 'B',	'D'
+ 	4. ns2civ,	ns2cek
+ 	5. 'C',	'E'
+ 	6. nc2sek,	nc2sik
+ 	7. 'D',	'F'
+ 	8. ns2cek,	ns2cik
+
+#156. 21 ncsl lines
+	5,dh.c:826,850
+	5,dh.c:853,877
+	6 parameters
+ 	1. 'A',	'D'
+ 	2. nc2siv,	ns2cek
+ 	3. 'B',	'E'
+ 	4. ns2civ,	nc2sik
+ 	5. 'C',	'F'
+ 	6. nc2sek,	ns2cik
+
+#157. 14 ncsl lines
+	5,dh.c:826,841
+	5,dh.c:862,877
+	4 parameters
+ 	1. 'A',	'E'
+ 	2. nc2siv,	nc2sik
+ 	3. 'B',	'F'
+ 	4. ns2civ,	ns2cik
+
+#158. 7 ncsl lines
+	5,dh.c:826,832
+	5,dh.c:871,877
+	2 parameters
+ 	1. 'A',	'F'
+ 	2. nc2siv,	ns2cik
+
+#159. 14 ncsl lines
+	1,cipheraes.c:69,83
 	1,cipheraes.c:77,91
 	(overlap; region has 2 nonoverlapping matching 7-ncsl-line segments)
 	6 parameters
@@ -855,368 +935,442 @@
  	5. "aes192-cbc",	"aes256-cbc"
  	6. initaes192,	initaes256
 
-#144. 4 ncsl lines
-	9,netssh.c:176,179
-	13,sshsession.c:191,194
+#160. 6 ncsl lines
+	9,netssh.c:2316,2321
+	9,netssh.c:2325,2330
 	1 parameters
- 	1. 'k',	'i'
+ 	1. SSH_MSG_CHANNEL_OPEN_CONFIRMATION,	SSH_MSG_CHANNEL_OPEN_FAILURE
 
-#145. 4 ncsl lines
-	12,ssh.c:467,470
-	13,sshsession.c:191,194
+#161. 3 ncsl lines
+	9,netssh.c:2078,2080
+	9,netssh.c:2212,2214
+	0 parameters
+
+#162. 4 ncsl lines
+	9,netssh.c:2138,2141
+	9,netssh.c:2172,2175
 	1 parameters
- 	1. 'I',	'i'
+ 	1. SSH_MSG_KEXDH_INIT,	SSH_MSG_SERVICE_REQUEST
 
-#146. 5 ncsl lines
-	9,netssh.c:626,630
-	9,netssh.c:648,652
+#163. 4 ncsl lines
+	9,netssh.c:2138,2141
+	9,netssh.c:2545,2548
 	1 parameters
- 	1. Qlisten,	Qclone
+ 	1. SSH_MSG_KEXDH_INIT,	SSH_MSG_USERAUTH_SUCCESS
 
-#147. 9 ncsl lines
-	9,netssh.c:1061,1070
-	9,netssh.c:1359,1368
+#164. 6 ncsl lines
+	9,netssh.c:1229,1234
+	9,netssh.c:1487,1492
+	1 parameters
+ 	1. ch,	sc
+
+#165. 3 ncsl lines
+	9,netssh.c:1229,1231
+	9,netssh.c:2330,2332
+	0 parameters
+
+#166. 6 ncsl lines
+	5,dh.c:164,169
+	5,dh.c:185,190
+	2 parameters
+ 	1. " p=",	" key="
+ 	2. "no key (p) found",	"no key (y) found"
+
+#167. 6 ncsl lines
+	5,dh.c:164,169
+	5,dh.c:178,183
+	2 parameters
+ 	1. " p=",	" alpha="
+ 	2. "no key (p) found",	"no key (g) found"
+
+#168. 6 ncsl lines
+	5,dh.c:164,169
+	5,dh.c:171,176
+	2 parameters
+ 	1. " p=",	" q="
+ 	2. "no key (p) found",	"no key (q) found"
+
+#169. 6 ncsl lines
+	5,dh.c:97,102
+	5,dh.c:106,111
+	2 parameters
+ 	1. " n=",	" ek="
+ 	2. "no key (n) found",	"no key (ek) found"
+
+#170. 4 ncsl lines
+	7,dial.thread.c:106,109
+	7,dial.thread.c:116,119
+	1 parameters
+ 	1. "/net",	"/net.alt"
+
+#171. 4 ncsl lines
+	6,dial.c:90,93
+	7,dial.thread.c:116,119
+	1 parameters
+ 	1. "/net",	"/net.alt"
+
+#172. 4 ncsl lines
+	6,dial.c:100,103
+	7,dial.thread.c:106,109
+	1 parameters
+ 	1. "/net.alt",	"/net"
+
+#173. 4 ncsl lines
+	6,dial.c:90,93
+	6,dial.c:100,103
+	1 parameters
+ 	1. "/net",	"/net.alt"
+
+#174. 9 ncsl lines
+	9,netssh.c:1066,1075
+	9,netssh.c:1365,1374
 	2 parameters
  	1. "ssh-userath auth failed (not Established)",	nil
  	2. writectlproc,	writedataproc
 
-#148. 8 ncsl lines
-	9,netssh.c:2082,2089
-	9,netssh.c:2244,2251
-	1 parameters
- 	1. SSH_MSG_NEWKEYS,	SSH_MSG_IGNORE
+#175. 4 ncsl lines
+	6,dial.c:357,361
+	7,dial.thread.c:361,365
+	0 parameters
 
-#149. 6 ncsl lines
-	9,netssh.c:2244,2249
-	9,netssh.c:2519,2524
+#176. 3 ncsl lines
+	12,ssh.c:278,280
+	12,ssh.c:319,322
 	0 parameters
 
-#150. 3 ncsl lines
-	9,netssh.c:1782,1784
-	9,netssh.c:1789,1791
+#177. 4 ncsl lines
+	5,dh.c:506,509
+	5,dh.c:723,726
 	0 parameters
 
-#151. 12 ncsl lines
-	9,netssh.c:183,194
-	13,sshsession.c:208,219
-	4 parameters
- 	1. mntpt,	shell
- 	2. 's',	'S'
- 	3. 'v',	't'
- 	4. nokeyverify,	tflag
+#178. 4 ncsl lines
+	5,dh.c:549,553
+	9,netssh.c:1693,1697
+	1 parameters
+ 	1. ret,	sc
 
-#152. 8 ncsl lines
-	6,dial.c:431,438
-	7,dial.thread.c:432,439
+#179. 5 ncsl lines
+	9,netssh.c:2171,2175
+	9,netssh.c:2544,2548
+	1 parameters
+ 	1. SSH_MSG_SERVICE_REQUEST,	SSH_MSG_USERAUTH_SUCCESS
+
+#180. 3 ncsl lines
+	9,netssh.c:2211,2213
+	9,netssh.c:2544,2546
 	0 parameters
 
-#153. 3 ncsl lines
-	12,ssh.c:163,165
-	12,ssh.c:167,171
+#181. 3 ncsl lines
+	9,netssh.c:2161,2163
+	9,netssh.c:2544,2546
 	0 parameters
 
-#154. 6 ncsl lines
+#182. 4 ncsl lines
+	5,dh.c:108,111
+	5,dh.c:198,201
+	1 parameters
+ 	1. "no key (ek) found",	"no key (x) found"
+
+#183. 4 ncsl lines
+	5,dh.c:187,190
+	5,dh.c:198,201
+	1 parameters
+ 	1. "no key (y) found",	"no key (x) found"
+
+#184. 4 ncsl lines
+	5,dh.c:180,183
+	5,dh.c:198,201
+	1 parameters
+ 	1. "no key (g) found",	"no key (x) found"
+
+#185. 4 ncsl lines
+	5,dh.c:173,176
+	5,dh.c:198,201
+	1 parameters
+ 	1. "no key (q) found",	"no key (x) found"
+
+#186. 4 ncsl lines
+	5,dh.c:99,102
+	5,dh.c:198,201
+	1 parameters
+ 	1. "no key (n) found",	"no key (x) found"
+
+#187. 4 ncsl lines
+	5,dh.c:166,169
+	5,dh.c:198,201
+	1 parameters
+ 	1. "no key (p) found",	"no key (x) found"
+
+#188. 6 ncsl lines
 	8,esmprint.c:6,12
 	9,netssh.c:127,134
 	0 parameters
 
-#155. 3 ncsl lines
+#189. 3 ncsl lines
 	8,esmprint.c:6,8
 	9,netssh.c:143,145
 	0 parameters
 
-#156. 3 ncsl lines
-	9,netssh.c:2165,2167
-	9,netssh.c:2205,2207
+#190. 3 ncsl lines
+	9,netssh.c:1232,1234
+	9,netssh.c:2371,2373
 	0 parameters
 
-#157. 3 ncsl lines
-	9,netssh.c:2155,2157
-	9,netssh.c:2205,2207
+#191. 3 ncsl lines
+	9,netssh.c:2171,2173
+	9,netssh.c:2211,2213
 	0 parameters
 
-#158. 3 ncsl lines
-	9,netssh.c:2155,2157
-	9,netssh.c:2165,2167
+#192. 3 ncsl lines
+	9,netssh.c:2161,2163
+	9,netssh.c:2171,2173
 	0 parameters
 
-#159. 3 ncsl lines
-	6,dial.c:449,451
-	6,dial.c:475,477
+#193. 3 ncsl lines
+	9,netssh.c:2161,2163
+	9,netssh.c:2211,2213
 	0 parameters
 
-#160. 3 ncsl lines
+#194. 3 ncsl lines
 	6,dial.c:449,451
 	7,dial.thread.c:476,478
 	0 parameters
 
-#161. 3 ncsl lines
+#195. 3 ncsl lines
+	6,dial.c:449,451
 	6,dial.c:475,477
-	7,dial.thread.c:450,452
 	0 parameters
 
-#162. 3 ncsl lines
+#196. 3 ncsl lines
 	7,dial.thread.c:450,452
 	7,dial.thread.c:476,478
 	0 parameters
 
-#163. 5 ncsl lines
-	5,dh.c:71,79
-	5,dh.c:137,145
-	1 parameters
- 	1. "rsakey",	"dsskey"
+#197. 3 ncsl lines
+	6,dial.c:475,477
+	7,dial.thread.c:450,452
+	0 parameters
 
-#164. 6 ncsl lines
-	9,netssh.c:1061,1067
-	9,netssh.c:1359,1365
+#198. 6 ncsl lines
+	9,netssh.c:1066,1072
+	9,netssh.c:1365,1371
 	2 parameters
  	1. "ssh-userath auth failed (not Established)",	nil
  	2. writectlproc,	writedataproc
 
-#165. 6 ncsl lines
-	9,netssh.c:2082,2087
-	9,netssh.c:2519,2524
-	0 parameters
-
-#166. 4 ncsl lines
-	10,pubkey.c:182,185
-	10,pubkey.c:195,198
+#199. 5 ncsl lines
+	5,dh.c:71,79
+	5,dh.c:137,145
 	1 parameters
- 	1. "%s: new key file changed names? %s to %s\n",	"%s: error renaming %s to %s: %r\n"
+ 	1. "rsakey",	"dsskey"
+
+#200. 3 ncsl lines
+	9,netssh.c:1699,1701
+	12,ssh.c:288,290
+	0 parameters
 
-#167. 3 ncsl lines
+#201. 3 ncsl lines
 	5,dh.c:436,439
-	9,netssh.c:1802,1811
+	9,netssh.c:1808,1817
 	0 parameters
 
-#168. 5 ncsl lines
+#202. 5 ncsl lines
 	2,cipherblowfish.c:42,47
 	3,cipherrc4.c:24,29
 	1 parameters
  	1. encryptblowfish,	encryptrc4
 
-#169. 3 ncsl lines
+#203. 3 ncsl lines
 	14,transport.c:74,76
 	14,transport.c:110,112
 	0 parameters
 
-#170. 7 ncsl lines
-	6,dial.c:485,491
-	7,dial.thread.c:486,492
-	0 parameters
+#204. 6 ncsl lines
+	5,dh.c:171,176
+	5,dh.c:185,190
+	2 parameters
+ 	1. " q=",	" key="
+ 	2. "no key (q) found",	"no key (y) found"
 
-#171. 6 ncsl lines
+#205. 6 ncsl lines
 	5,dh.c:171,176
 	5,dh.c:178,183
 	2 parameters
  	1. " q=",	" alpha="
  	2. "no key (q) found",	"no key (g) found"
 
-#172. 6 ncsl lines
-	5,dh.c:171,176
-	5,dh.c:185,190
-	2 parameters
- 	1. " q=",	" key="
- 	2. "no key (q) found",	"no key (y) found"
+#206. 4 ncsl lines
+	9,netssh.c:2726,2729
+	9,netssh.c:2758,2761
+	1 parameters
+ 	1. foundc1,	foundm2
 
-#173. 4 ncsl lines
-	9,netssh.c:2709,2712
-	9,netssh.c:2741,2744
+#207. 4 ncsl lines
+	9,netssh.c:2726,2729
+	9,netssh.c:2747,2750
 	1 parameters
- 	1. foundpka,	foundm1
+ 	1. foundc1,	foundm1
 
-#174. 4 ncsl lines
-	9,netssh.c:2709,2712
-	9,netssh.c:2752,2755
+#208. 4 ncsl lines
+	9,netssh.c:2715,2718
+	9,netssh.c:2758,2761
 	1 parameters
  	1. foundpka,	foundm2
 
-#175. 4 ncsl lines
-	9,netssh.c:2730,2733
-	9,netssh.c:2741,2744
+#209. 4 ncsl lines
+	9,netssh.c:2715,2718
+	9,netssh.c:2747,2750
 	1 parameters
- 	1. foundc2,	foundm1
+ 	1. foundpka,	foundm1
 
-#176. 4 ncsl lines
-	9,netssh.c:2730,2733
-	9,netssh.c:2752,2755
+#210. 4 ncsl lines
+	9,netssh.c:2736,2739
+	9,netssh.c:2758,2761
 	1 parameters
  	1. foundc2,	foundm2
 
-#177. 4 ncsl lines
-	9,netssh.c:2720,2723
-	9,netssh.c:2741,2744
+#211. 4 ncsl lines
+	9,netssh.c:2736,2739
+	9,netssh.c:2747,2750
 	1 parameters
- 	1. foundc1,	foundm1
+ 	1. foundc2,	foundm1
 
-#178. 4 ncsl lines
-	9,netssh.c:2720,2723
-	9,netssh.c:2752,2755
+#212. 4 ncsl lines
+	9,netssh.c:2704,2707
+	9,netssh.c:2758,2761
 	1 parameters
- 	1. foundc1,	foundm2
+ 	1. foundk,	foundm2
 
-#179. 4 ncsl lines
-	9,netssh.c:2698,2701
-	9,netssh.c:2741,2744
+#213. 4 ncsl lines
+	9,netssh.c:2704,2707
+	9,netssh.c:2747,2750
 	1 parameters
  	1. foundk,	foundm1
 
-#180. 4 ncsl lines
-	9,netssh.c:2698,2701
-	9,netssh.c:2752,2755
-	1 parameters
- 	1. foundk,	foundm2
-
-#181. 3 ncsl lines
+#214. 3 ncsl lines
 	6,dial.c:426,428
 	7,dial.thread.c:426,428
 	0 parameters
 
-#182. 7 ncsl lines
-	9,netssh.c:1233,1239
-	9,netssh.c:1489,1495
+#215. 7 ncsl lines
+	9,netssh.c:1238,1244
+	9,netssh.c:1495,1501
 	1 parameters
  	1. Closed,	Closing
 
-#183. 7 ncsl lines
-	9,netssh.c:1443,1449
-	9,netssh.c:1489,1495
+#216. 7 ncsl lines
+	9,netssh.c:1449,1455
+	9,netssh.c:1495,1501
 	0 parameters
 
-#184. 4 ncsl lines
-	9,netssh.c:334,337
-	9,netssh.c:693,696
-	1 parameters
- 	1. Qclone,	Qstatus
+#217. 7 ncsl lines
+	6,dial.c:485,491
+	7,dial.thread.c:486,492
+	0 parameters
 
-#185. 4 ncsl lines
+#218. 4 ncsl lines
 	13,sshsession.c:365,368
 	13,sshsession.c:373,376
 	0 parameters
 
-#186. 3 ncsl lines
-	9,netssh.c:1245,1247
-	9,netssh.c:2208,2210
+#219. 4 ncsl lines
+	9,netssh.c:339,342
+	9,netssh.c:698,701
+	1 parameters
+ 	1. Qclone,	Qstatus
+
+#220. 3 ncsl lines
+	9,netssh.c:1250,1252
+	9,netssh.c:2214,2216
 	0 parameters
 
-#187. 5 ncsl lines
+#221. 5 ncsl lines
 	14,transport.c:129,134
 	14,transport.c:174,183
 	1 parameters
  	1. finish_packet,	undo_packet
 
-#188. 6 ncsl lines
-	9,netssh.c:676,681
-	9,netssh.c:709,715
-	2 parameters
- 	1. Qlocal,	Qtcp
- 	2. "::!0\n",	"-1\n"
-
-#189. 3 ncsl lines
-	9,netssh.c:2894,2896
-	9,netssh.c:2911,2913
+#222. 4 ncsl lines
+	10,pubkey.c:35,38
+	10,pubkey.c:49,52
 	0 parameters
 
-#190. 3 ncsl lines
-	9,netssh.c:2880,2882
-	9,netssh.c:2911,2913
+#223. 3 ncsl lines
+	6,dial.c:364,366
+	6,dial.c:420,422
 	0 parameters
 
-#191. 3 ncsl lines
+#224. 3 ncsl lines
 	5,dh.c:109,111
 	5,dh.c:122,124
 	0 parameters
 
-#192. 3 ncsl lines
+#225. 3 ncsl lines
 	5,dh.c:122,124
 	5,dh.c:199,201
 	0 parameters
 
-#193. 3 ncsl lines
+#226. 3 ncsl lines
 	5,dh.c:122,124
 	5,dh.c:155,157
 	0 parameters
 
-#194. 3 ncsl lines
+#227. 3 ncsl lines
 	5,dh.c:122,124
 	5,dh.c:188,190
 	0 parameters
 
-#195. 3 ncsl lines
+#228. 3 ncsl lines
 	5,dh.c:122,124
 	5,dh.c:181,183
 	0 parameters
 
-#196. 3 ncsl lines
+#229. 3 ncsl lines
 	5,dh.c:122,124
 	5,dh.c:174,176
 	0 parameters
 
-#197. 3 ncsl lines
+#230. 3 ncsl lines
 	5,dh.c:100,102
 	5,dh.c:122,124
 	0 parameters
 
-#198. 3 ncsl lines
+#231. 3 ncsl lines
 	5,dh.c:122,124
 	5,dh.c:167,169
 	0 parameters
 
-#199. 3 ncsl lines
-	5,dh.c:289,291
-	5,dh.c:424,426
-	0 parameters
-
-#200. 3 ncsl lines
-	6,dial.c:364,366
-	6,dial.c:420,422
-	0 parameters
-
-#201. 4 ncsl lines
-	10,pubkey.c:35,38
-	10,pubkey.c:49,52
-	0 parameters
-
-#202. 4 ncsl lines
-	9,netssh.c:591,594
-	9,netssh.c:1220,1223
+#232. 3 ncsl lines
+	9,netssh.c:2886,2888
+	9,netssh.c:2917,2919
 	0 parameters
 
-#203. 3 ncsl lines
-	9,netssh.c:650,652
-	9,netssh.c:954,956
+#233. 3 ncsl lines
+	9,netssh.c:2900,2902
+	9,netssh.c:2917,2919
 	0 parameters
 
-#204. 3 ncsl lines
-	9,netssh.c:628,630
-	9,netssh.c:954,956
+#234. 3 ncsl lines
+	5,dh.c:289,291
+	5,dh.c:424,426
 	0 parameters
 
-#205. 5 ncsl lines
-	9,netssh.c:898,902
-	9,netssh.c:916,920
-	1 parameters
- 	1. "sending EOF1 to channel listener",	"sending EOF2 to channel listener"
+#235. 6 ncsl lines
+	9,netssh.c:681,686
+	9,netssh.c:714,720
+	2 parameters
+ 	1. Qlocal,	Qtcp
+ 	2. "::!0\n",	"-1\n"
 
-#206. 4 ncsl lines
-	9,netssh.c:1056,1059
-	9,netssh.c:1819,1822
+#236. 4 ncsl lines
+	9,netssh.c:493,497
+	9,netssh.c:1269,1273
 	1 parameters
- 	1. "sleeping for auth",	"awaiting establishment"
-
-#207. 3 ncsl lines
-	9,netssh.c:671,673
-	9,netssh.c:869,871
-	0 parameters
-
-#208. 3 ncsl lines
-	9,netssh.c:671,673
-	9,netssh.c:836,838
-	0 parameters
+ 	1. "stlischan",	"writereqremproc"
 
-#209. 17 ncsl lines
-	9,netssh.c:2709,2726
-	9,netssh.c:2720,2737
+#237. 17 ncsl lines
+	9,netssh.c:2715,2732
+	9,netssh.c:2726,2743
 	(overlap; region has 2 nonoverlapping matching 10-ncsl-line segments)
 	4 parameters
  	1. foundpka,	foundc1
@@ -1224,23 +1378,17 @@
  	3. foundc1,	foundc2
  	4. ncscrypt,	nsccrypt
 
-#210. 9 ncsl lines
-	9,netssh.c:2720,2728
-	9,netssh.c:2730,2739
+#238. 9 ncsl lines
+	9,netssh.c:2726,2734
+	9,netssh.c:2736,2745
 	3 parameters
  	1. foundc1,	foundc2
  	2. ncscrypt,	nsccrypt
  	3. cryptos,	macnames
 
-#211. 4 ncsl lines
-	9,netssh.c:488,492
-	9,netssh.c:1264,1268
-	1 parameters
- 	1. "stlischan",	"writereqremproc"
-
-#212. 22 ncsl lines
-	9,netssh.c:2614,2637
-	9,netssh.c:2627,2650
+#239. 22 ncsl lines
+	9,netssh.c:2620,2643
+	9,netssh.c:2633,2656
 	(overlap; region has 2 nonoverlapping matching 12-ncsl-line segments)
 	8 parameters
  	1. foundpka,	foundc1
@@ -1252,617 +1400,640 @@
  	7. ncscrypt,	nsccrypt
  	8. "received S2C crypto algs: %s",	"received C2S MAC algs: %s"
 
-#213. 4 ncsl lines
-	9,netssh.c:516,519
-	9,netssh.c:910,913
-	0 parameters
-
-#214. 4 ncsl lines
-	9,netssh.c:758,761
-	9,netssh.c:835,838
+#240. 5 ncsl lines
+	9,netssh.c:903,907
+	9,netssh.c:921,925
 	1 parameters
- 	1. "Key file collision",	nil
+ 	1. "sending EOF1 to channel listener",	"sending EOF2 to channel listener"
 
-#215. 4 ncsl lines
-	9,netssh.c:418,421
-	9,netssh.c:899,902
-	1 parameters
- 	1. "top level listen conn poisoned",	nil
+#241. 3 ncsl lines
+	9,netssh.c:633,635
+	9,netssh.c:959,961
+	0 parameters
 
-#216. 4 ncsl lines
-	9,netssh.c:418,421
-	9,netssh.c:917,920
-	1 parameters
- 	1. "top level listen conn poisoned",	nil
+#242. 3 ncsl lines
+	9,netssh.c:655,657
+	9,netssh.c:959,961
+	0 parameters
 
-#217. 8 ncsl lines
-	6,dial.c:332,340
-	7,dial.thread.c:332,340
+#243. 4 ncsl lines
+	9,netssh.c:1061,1064
+	9,netssh.c:1825,1828
 	1 parameters
- 	1. rv,	dfd
+ 	1. "sleeping for auth",	"awaiting establishment"
 
-#218. 3 ncsl lines
-	9,netssh.c:1802,1811
-	9,netssh.c:1830,1834
+#244. 3 ncsl lines
+	9,netssh.c:676,678
+	9,netssh.c:841,843
 	0 parameters
 
-#219. 3 ncsl lines
-	5,dh.c:436,439
-	9,netssh.c:1830,1834
+#245. 3 ncsl lines
+	9,netssh.c:676,678
+	9,netssh.c:874,876
 	0 parameters
 
-#220. 3 ncsl lines
+#246. 4 ncsl lines
+	9,netssh.c:596,599
+	9,netssh.c:1225,1228
+	0 parameters
+
+#247. 3 ncsl lines
 	6,dial.c:141,144
 	7,dial.thread.c:177,180
 	0 parameters
 
-#221. 3 ncsl lines
+#248. 3 ncsl lines
 	6,dial.c:141,144
 	6,dial.c:275,278
 	0 parameters
 
-#222. 3 ncsl lines
-	9,netssh.c:1693,1695
-	12,ssh.c:265,267
+#249. 8 ncsl lines
+	6,dial.c:332,340
+	7,dial.thread.c:332,340
+	1 parameters
+ 	1. rv,	dfd
+
+#250. 3 ncsl lines
+	9,netssh.c:1808,1817
+	9,netssh.c:1836,1840
 	0 parameters
 
-#223. 3 ncsl lines
+#251. 3 ncsl lines
+	5,dh.c:436,439
+	9,netssh.c:1836,1840
+	0 parameters
+
+#252. 4 ncsl lines
+	9,netssh.c:521,524
+	9,netssh.c:915,918
+	0 parameters
+
+#253. 4 ncsl lines
+	9,netssh.c:423,426
+	9,netssh.c:904,907
+	1 parameters
+ 	1. "top level listen conn poisoned",	nil
+
+#254. 4 ncsl lines
+	9,netssh.c:423,426
+	9,netssh.c:922,925
+	1 parameters
+ 	1. "top level listen conn poisoned",	nil
+
+#255. 4 ncsl lines
+	9,netssh.c:763,766
+	9,netssh.c:840,843
+	1 parameters
+ 	1. "Key file collision",	nil
+
+#256. 3 ncsl lines
 	7,dial.thread.c:158,161
 	13,sshsession.c:117,120
 	0 parameters
 
-#224. 3 ncsl lines
-	9,netssh.c:1495,1498
-	9,netssh.c:2554,2557
+#257. 3 ncsl lines
+	9,netssh.c:1501,1504
+	9,netssh.c:2560,2563
 	0 parameters
 
-#225. 3 ncsl lines
-	9,netssh.c:2554,2557
+#258. 3 ncsl lines
+	9,netssh.c:2560,2563
+	12,ssh.c:472,475
+	0 parameters
+
+#259. 3 ncsl lines
+	9,netssh.c:1501,1504
+	12,ssh.c:472,475
+	0 parameters
+
+#260. 3 ncsl lines
+	12,ssh.c:472,475
 	13,sshsession.c:328,331
 	0 parameters
 
-#226. 3 ncsl lines
+#261. 3 ncsl lines
+	9,netssh.c:2560,2563
+	13,sshsession.c:328,331
+	0 parameters
+
+#262. 3 ncsl lines
 	6,dial.c:164,167
-	12,ssh.c:259,263
+	12,ssh.c:282,286
 	0 parameters
 
-#227. 3 ncsl lines
+#263. 3 ncsl lines
 	6,dial.c:164,167
-	12,ssh.c:112,116
+	12,ssh.c:151,154
 	0 parameters
 
-#228. 3 ncsl lines
-	12,ssh.c:112,116
-	12,ssh.c:259,263
+#264. 3 ncsl lines
+	6,dial.c:164,167
+	7,dial.thread.c:149,152
 	0 parameters
 
-#229. 3 ncsl lines
+#265. 3 ncsl lines
 	6,dial.c:164,167
 	13,sshsession.c:302,305
 	0 parameters
 
-#230. 3 ncsl lines
+#266. 3 ncsl lines
+	6,dial.c:164,167
+	12,ssh.c:112,116
+	0 parameters
+
+#267. 3 ncsl lines
 	12,ssh.c:112,116
 	13,sshsession.c:302,305
 	0 parameters
 
-#231. 3 ncsl lines
+#268. 3 ncsl lines
 	7,dial.thread.c:149,152
 	12,ssh.c:112,116
 	0 parameters
 
-#232. 3 ncsl lines
-	6,dial.c:164,167
-	7,dial.thread.c:149,152
+#269. 3 ncsl lines
+	12,ssh.c:112,116
+	12,ssh.c:151,154
 	0 parameters
 
-#233. 3 ncsl lines
-	9,netssh.c:2208,2210
-	12,ssh.c:309,311
+#270. 3 ncsl lines
+	12,ssh.c:112,116
+	12,ssh.c:282,286
 	0 parameters
 
-#234. 3 ncsl lines
-	9,netssh.c:1245,1247
-	12,ssh.c:309,311
+#271. 3 ncsl lines
+	9,netssh.c:1250,1252
+	12,ssh.c:332,334
 	0 parameters
 
-#235. 8 ncsl lines
-	9,netssh.c:1062,1070
-	9,netssh.c:1253,1261
-	1 parameters
- 	1. writectlproc,	writereqremproc
+#272. 3 ncsl lines
+	9,netssh.c:2214,2216
+	12,ssh.c:332,334
+	0 parameters
 
-#236. 8 ncsl lines
-	9,netssh.c:1253,1261
-	9,netssh.c:1360,1368
+#273. 8 ncsl lines
+	9,netssh.c:1258,1266
+	9,netssh.c:1366,1374
 	1 parameters
  	1. writereqremproc,	writedataproc
 
-#237. 4 ncsl lines
-	9,netssh.c:392,396
-	9,netssh.c:1360,1364
+#274. 8 ncsl lines
+	9,netssh.c:1067,1075
+	9,netssh.c:1258,1266
+	1 parameters
+ 	1. writectlproc,	writereqremproc
+
+#275. 4 ncsl lines
+	9,netssh.c:397,401
+	9,netssh.c:1366,1370
 	1 parameters
  	1. stlisconn,	writedataproc
 
-#238. 4 ncsl lines
-	9,netssh.c:392,396
-	9,netssh.c:1062,1066
+#276. 4 ncsl lines
+	9,netssh.c:397,401
+	9,netssh.c:1067,1071
 	1 parameters
  	1. stlisconn,	writectlproc
 
-#239. 4 ncsl lines
+#277. 4 ncsl lines
 	9,netssh.c:164,168
 	13,sshsession.c:178,182
 	1 parameters
  	1. threadmain,	main
 
-#240. 4 ncsl lines
+#278. 4 ncsl lines
 	11,rsa2ssh2.c:20,24
 	13,sshsession.c:178,182
 	0 parameters
 
-#241. 6 ncsl lines
+#279. 6 ncsl lines
 	1,cipheraes.c:47,53
 	1,cipheraes.c:57,63
 	1 parameters
  	1. encryptaes,	decryptaes
 
-#242. 4 ncsl lines
+#280. 4 ncsl lines
+	9,netssh.c:1764,1768
+	9,netssh.c:2071,2075
+	1 parameters
+ 	1. hangupconn,	establish
+
+#281. 4 ncsl lines
 	7,dial.thread.c:140,144
 	7,dial.thread.c:228,233
 	1 parameters
  	1. freedest,	intrcallprocs
 
-#243. 4 ncsl lines
-	9,netssh.c:1758,1762
-	9,netssh.c:2065,2069
-	1 parameters
- 	1. hangupconn,	establish
+#282. 3 ncsl lines
+	9,netssh.c:1678,1680
+	9,netssh.c:3200,3202
+	0 parameters
 
-#244. 3 ncsl lines
-	9,netssh.c:1672,1674
+#283. 3 ncsl lines
+	9,netssh.c:1678,1680
 	9,netssh.c:3194,3196
 	0 parameters
 
-#245. 3 ncsl lines
-	9,netssh.c:1672,1674
-	9,netssh.c:3188,3190
+#284. 3 ncsl lines
+	9,netssh.c:317,320
+	9,netssh.c:928,931
 	0 parameters
 
-#246. 3 ncsl lines
-	9,netssh.c:666,668
-	9,netssh.c:1701,1703
+#285. 3 ncsl lines
+	9,netssh.c:396,399
+	9,netssh.c:928,931
 	0 parameters
 
-#247. 3 ncsl lines
-	9,netssh.c:666,668
-	12,ssh.c:218,220
+#286. 3 ncsl lines
+	9,netssh.c:928,931
+	9,netssh.c:1257,1260
 	0 parameters
 
-#248. 3 ncsl lines
-	9,netssh.c:1701,1703
-	12,ssh.c:218,220
+#287. 3 ncsl lines
+	9,netssh.c:481,484
+	9,netssh.c:928,931
 	0 parameters
 
-#249. 3 ncsl lines
-	9,netssh.c:961,963
-	9,netssh.c:1701,1703
-	0 parameters
+#288. 5 ncsl lines
+	13,sshsession.c:85,89
+	13,sshsession.c:171,175
+	1 parameters
+ 	1. "capuse",	"fork"
 
-#250. 3 ncsl lines
-	9,netssh.c:961,963
-	12,ssh.c:218,220
-	0 parameters
+#289. 4 ncsl lines
+	13,sshsession.c:85,88
+	13,sshsession.c:247,250
+	1 parameters
+ 	1. "capuse",	"read cap"
 
-#251. 3 ncsl lines
-	9,netssh.c:971,973
-	12,ssh.c:218,220
+#290. 3 ncsl lines
+	13,sshsession.c:79,81
+	13,sshsession.c:85,87
 	0 parameters
 
-#252. 3 ncsl lines
-	9,netssh.c:971,973
-	9,netssh.c:1701,1703
-	0 parameters
+#291. 4 ncsl lines
+	6,dial.c:420,424
+	7,dial.thread.c:419,424
+	1 parameters
+ 	1. rv,	dfd
 
-#253. 3 ncsl lines
-	9,netssh.c:724,726
-	9,netssh.c:1701,1703
+#292. 3 ncsl lines
+	9,netssh.c:976,978
+	9,netssh.c:1707,1709
 	0 parameters
 
-#254. 3 ncsl lines
-	9,netssh.c:724,726
-	12,ssh.c:218,220
+#293. 3 ncsl lines
+	9,netssh.c:729,731
+	9,netssh.c:1707,1709
 	0 parameters
 
-#255. 3 ncsl lines
-	9,netssh.c:380,382
-	12,ssh.c:218,220
+#294. 3 ncsl lines
+	9,netssh.c:385,387
+	9,netssh.c:1707,1709
 	0 parameters
 
-#256. 3 ncsl lines
-	9,netssh.c:380,382
-	9,netssh.c:1701,1703
+#295. 3 ncsl lines
+	9,netssh.c:966,968
+	9,netssh.c:1707,1709
 	0 parameters
 
-#257. 42 ncsl lines
-	6,dial.c:68,124
-	7,dial.thread.c:85,140
+#296. 3 ncsl lines
+	9,netssh.c:671,673
+	9,netssh.c:1707,1709
 	0 parameters
 
-#258. 5 ncsl lines
-	13,sshsession.c:85,89
-	13,sshsession.c:171,175
-	1 parameters
- 	1. "capuse",	"fork"
+#297. 3 ncsl lines
+	9,netssh.c:1707,1709
+	12,ssh.c:241,243
+	0 parameters
 
-#259. 4 ncsl lines
-	13,sshsession.c:85,88
-	13,sshsession.c:247,250
-	1 parameters
- 	1. "capuse",	"read cap"
+#298. 3 ncsl lines
+	9,netssh.c:671,673
+	12,ssh.c:241,243
+	0 parameters
 
-#260. 3 ncsl lines
-	13,sshsession.c:79,81
-	13,sshsession.c:85,87
+#299. 3 ncsl lines
+	9,netssh.c:966,968
+	12,ssh.c:241,243
 	0 parameters
 
-#261. 3 ncsl lines
-	9,netssh.c:312,315
-	9,netssh.c:923,926
+#300. 3 ncsl lines
+	9,netssh.c:385,387
+	12,ssh.c:241,243
 	0 parameters
 
-#262. 3 ncsl lines
-	9,netssh.c:391,394
-	9,netssh.c:923,926
+#301. 3 ncsl lines
+	9,netssh.c:729,731
+	12,ssh.c:241,243
 	0 parameters
 
-#263. 3 ncsl lines
-	9,netssh.c:923,926
-	9,netssh.c:1252,1255
+#302. 3 ncsl lines
+	9,netssh.c:976,978
+	12,ssh.c:241,243
 	0 parameters
 
-#264. 3 ncsl lines
-	9,netssh.c:476,479
-	9,netssh.c:923,926
+#303. 42 ncsl lines
+	6,dial.c:68,124
+	7,dial.thread.c:85,140
 	0 parameters
 
-#265. 4 ncsl lines
-	6,dial.c:420,424
-	7,dial.thread.c:419,424
+#304. 4 ncsl lines
+	10,pubkey.c:182,185
+	10,pubkey.c:195,198
 	1 parameters
- 	1. rv,	dfd
-
-#266. 4 ncsl lines
-	9,netssh.c:1186,1189
-	9,netssh.c:1492,1495
-	0 parameters
+ 	1. "%s: new key file changed names? %s to %s\n",	"%s: error renaming %s to %s: %r\n"
 
-#267. 4 ncsl lines
-	9,netssh.c:1186,1189
-	9,netssh.c:1236,1239
+#305. 4 ncsl lines
+	9,netssh.c:1191,1194
+	9,netssh.c:1498,1501
 	0 parameters
 
-#268. 4 ncsl lines
-	9,netssh.c:1186,1189
-	9,netssh.c:1446,1449
+#306. 4 ncsl lines
+	9,netssh.c:1191,1194
+	9,netssh.c:1452,1455
 	0 parameters
 
-#269. 9 ncsl lines
-	6,dial.c:442,452
-	7,dial.thread.c:443,453
+#307. 4 ncsl lines
+	9,netssh.c:1191,1194
+	9,netssh.c:1241,1244
 	0 parameters
 
-#270. 4 ncsl lines
-	9,netssh.c:2595,2598
-	9,netssh.c:2634,2637
-	1 parameters
- 	1. "received KEX algs: %s",	"received S2C crypto algs: %s"
-
-#271. 4 ncsl lines
-	9,netssh.c:2595,2598
-	9,netssh.c:2621,2624
-	1 parameters
- 	1. "received KEX algs: %s",	"received C2S crypto algs: %s"
-
-#272. 4 ncsl lines
-	9,netssh.c:2595,2598
-	9,netssh.c:2660,2663
-	1 parameters
- 	1. "received KEX algs: %s",	"received S2C MAC algs: %s"
+#308. 11 ncsl lines
+	9,netssh.c:493,504
+	9,netssh.c:887,898
+	2 parameters
+ 	1. "stlischan",	"readdata"
+ 	2. "bad channel",	"bad connection"
 
-#273. 4 ncsl lines
-	9,netssh.c:2595,2598
-	9,netssh.c:2647,2650
-	1 parameters
- 	1. "received KEX algs: %s",	"received C2S MAC algs: %s"
+#309. 8 ncsl lines
+	9,netssh.c:493,501
+	9,netssh.c:1376,1384
+	2 parameters
+ 	1. "stlischan",	"writedataproc"
+ 	2. "bad channel",	"Invalid connection"
 
-#274. 4 ncsl lines
-	9,netssh.c:2595,2598
-	9,netssh.c:2608,2611
+#310. 4 ncsl lines
+	9,netssh.c:1269,1273
+	9,netssh.c:1376,1380
 	1 parameters
- 	1. "received KEX algs: %s",	"received host key algs: %s"
+ 	1. "writereqremproc",	"writedataproc"
 
-#275. 5 ncsl lines
-	9,netssh.c:1123,1129
-	9,netssh.c:1158,1163
+#311. 4 ncsl lines
+	9,netssh.c:887,891
+	9,netssh.c:1269,1273
 	1 parameters
- 	1. "connect handshake failed: ",	"accept handshake failed: "
+ 	1. "readdata",	"writereqremproc"
 
-#276. 3 ncsl lines
-	9,netssh.c:591,593
-	9,netssh.c:1356,1358
+#312. 9 ncsl lines
+	6,dial.c:442,452
+	7,dial.thread.c:443,453
 	0 parameters
 
-#277. 3 ncsl lines
-	9,netssh.c:1220,1222
-	9,netssh.c:1356,1358
+#313. 6 ncsl lines
+	9,netssh.c:2088,2093
+	9,netssh.c:2525,2530
 	0 parameters
 
-#278. 3 ncsl lines
-	9,netssh.c:658,660
-	9,netssh.c:869,871
+#314. 3 ncsl lines
+	5,dh.c:280,282
+	5,dh.c:418,420
 	0 parameters
 
-#279. 3 ncsl lines
-	9,netssh.c:658,660
-	9,netssh.c:671,673
+#315. 3 ncsl lines
+	9,netssh.c:663,665
+	9,netssh.c:874,876
 	0 parameters
 
-#280. 3 ncsl lines
-	9,netssh.c:628,630
-	9,netssh.c:869,871
+#316. 3 ncsl lines
+	9,netssh.c:663,665
+	9,netssh.c:841,843
 	0 parameters
 
-#281. 3 ncsl lines
-	9,netssh.c:628,630
-	9,netssh.c:671,673
+#317. 3 ncsl lines
+	9,netssh.c:663,665
+	9,netssh.c:676,678
 	0 parameters
 
-#282. 3 ncsl lines
-	9,netssh.c:628,630
-	9,netssh.c:658,660
+#318. 3 ncsl lines
+	9,netssh.c:655,657
+	9,netssh.c:663,665
 	0 parameters
 
-#283. 3 ncsl lines
-	9,netssh.c:650,652
-	9,netssh.c:658,660
+#319. 3 ncsl lines
+	9,netssh.c:655,657
+	9,netssh.c:676,678
 	0 parameters
 
-#284. 3 ncsl lines
-	9,netssh.c:650,652
-	9,netssh.c:869,871
+#320. 3 ncsl lines
+	9,netssh.c:655,657
+	9,netssh.c:874,876
 	0 parameters
 
-#285. 3 ncsl lines
-	9,netssh.c:650,652
-	9,netssh.c:671,673
+#321. 3 ncsl lines
+	9,netssh.c:655,657
+	9,netssh.c:841,843
 	0 parameters
 
-#286. 3 ncsl lines
-	9,netssh.c:869,871
-	9,netssh.c:954,956
+#322. 3 ncsl lines
+	9,netssh.c:633,635
+	9,netssh.c:676,678
 	0 parameters
 
-#287. 3 ncsl lines
-	9,netssh.c:671,673
-	9,netssh.c:954,956
+#323. 3 ncsl lines
+	9,netssh.c:633,635
+	9,netssh.c:874,876
 	0 parameters
 
-#288. 3 ncsl lines
-	9,netssh.c:658,660
-	9,netssh.c:954,956
+#324. 3 ncsl lines
+	9,netssh.c:633,635
+	9,netssh.c:841,843
 	0 parameters
 
-#289. 3 ncsl lines
-	9,netssh.c:658,660
-	9,netssh.c:836,838
+#325. 3 ncsl lines
+	9,netssh.c:633,635
+	9,netssh.c:663,665
 	0 parameters
 
-#290. 3 ncsl lines
-	9,netssh.c:836,838
-	9,netssh.c:954,956
+#326. 3 ncsl lines
+	9,netssh.c:663,665
+	9,netssh.c:959,961
 	0 parameters
 
-#291. 3 ncsl lines
-	9,netssh.c:650,652
-	9,netssh.c:836,838
+#327. 3 ncsl lines
+	9,netssh.c:676,678
+	9,netssh.c:959,961
 	0 parameters
 
-#292. 3 ncsl lines
-	9,netssh.c:628,630
-	9,netssh.c:836,838
+#328. 3 ncsl lines
+	9,netssh.c:874,876
+	9,netssh.c:959,961
 	0 parameters
 
-#293. 3 ncsl lines
-	5,dh.c:280,282
-	5,dh.c:418,420
+#329. 3 ncsl lines
+	9,netssh.c:841,843
+	9,netssh.c:959,961
 	0 parameters
 
-#294. 11 ncsl lines
-	9,netssh.c:488,499
-	9,netssh.c:882,893
-	2 parameters
- 	1. "stlischan",	"readdata"
- 	2. "bad channel",	"bad connection"
-
-#295. 8 ncsl lines
-	9,netssh.c:488,496
-	9,netssh.c:1370,1378
-	2 parameters
- 	1. "stlischan",	"writedataproc"
- 	2. "bad channel",	"Invalid connection"
+#330. 3 ncsl lines
+	9,netssh.c:596,598
+	9,netssh.c:1362,1364
+	0 parameters
 
-#296. 4 ncsl lines
-	9,netssh.c:882,886
-	9,netssh.c:1264,1268
-	1 parameters
- 	1. "readdata",	"writereqremproc"
+#331. 3 ncsl lines
+	9,netssh.c:1225,1227
+	9,netssh.c:1362,1364
+	0 parameters
 
-#297. 4 ncsl lines
-	9,netssh.c:1264,1268
-	9,netssh.c:1370,1374
+#332. 5 ncsl lines
+	9,netssh.c:1128,1134
+	9,netssh.c:1163,1168
 	1 parameters
- 	1. "writereqremproc",	"writedataproc"
-
-#298. 10 ncsl lines
-	9,netssh.c:473,483
-	9,netssh.c:1249,1259
-	4 parameters
- 	1. closeioproc,	free
- 	2. io,	buf
- 	3. stlischan,	writereqremproc
- 	4. p2,	p
+ 	1. "connect handshake failed: ",	"accept handshake failed: "
 
-#299. 3 ncsl lines
-	9,netssh.c:2773,2779
-	9,netssh.c:3073,3077
+#333. 3 ncsl lines
+	5,dh.c:617,620
+	9,netssh.c:1808,1817
 	0 parameters
 
-#300. 3 ncsl lines
+#334. 3 ncsl lines
 	5,dh.c:617,620
-	9,netssh.c:1802,1811
+	9,netssh.c:1836,1840
 	0 parameters
 
-#301. 3 ncsl lines
-	5,dh.c:617,620
-	9,netssh.c:1830,1834
+#335. 3 ncsl lines
+	5,dh.c:575,578
+	9,netssh.c:1808,1817
 	0 parameters
 
-#302. 3 ncsl lines
-	6,dial.c:332,335
-	6,dial.c:421,424
+#336. 3 ncsl lines
+	5,dh.c:575,578
+	9,netssh.c:1836,1840
 	0 parameters
 
-#303. 3 ncsl lines
+#337. 3 ncsl lines
 	5,dh.c:436,439
 	5,dh.c:617,620
 	0 parameters
 
-#304. 3 ncsl lines
-	5,dh.c:575,578
-	9,netssh.c:1802,1811
-	0 parameters
-
-#305. 3 ncsl lines
-	5,dh.c:575,578
-	9,netssh.c:1830,1834
+#338. 3 ncsl lines
+	6,dial.c:332,335
+	6,dial.c:421,424
 	0 parameters
 
-#306. 3 ncsl lines
+#339. 3 ncsl lines
 	5,dh.c:436,439
 	5,dh.c:789,792
 	0 parameters
 
-#307. 3 ncsl lines
+#340. 3 ncsl lines
 	5,dh.c:789,792
-	9,netssh.c:1802,1811
+	9,netssh.c:1808,1817
 	0 parameters
 
-#308. 3 ncsl lines
+#341. 3 ncsl lines
 	5,dh.c:789,792
-	9,netssh.c:1830,1834
+	9,netssh.c:1836,1840
 	0 parameters
 
-#309. 3 ncsl lines
+#342. 3 ncsl lines
 	5,dh.c:296,304
 	5,dh.c:428,431
 	0 parameters
 
-#310. 3 ncsl lines
+#343. 3 ncsl lines
 	7,dial.thread.c:332,335
 	7,dial.thread.c:420,424
 	0 parameters
 
-#311. 3 ncsl lines
-	9,netssh.c:1227,1229
-	9,netssh.c:2365,2367
+#344. 3 ncsl lines
+	9,netssh.c:2779,2785
+	9,netssh.c:3079,3083
 	0 parameters
 
-#312. 4 ncsl lines
+#345. 4 ncsl lines
 	1,cipheraes.c:12,16
-	2,cipherblowfish.c:10,14
+	3,cipherrc4.c:10,14
 	1 parameters
- 	1. AESstate,	BFstate
+ 	1. AESstate,	RC4state
 
-#313. 4 ncsl lines
+#346. 4 ncsl lines
 	0,cipher3des.c:10,14
 	1,cipheraes.c:12,16
 	1 parameters
  	1. DES3state,	AESstate
 
-#314. 4 ncsl lines
+#347. 4 ncsl lines
 	1,cipheraes.c:12,16
-	3,cipherrc4.c:10,14
+	2,cipherblowfish.c:10,14
 	1 parameters
- 	1. AESstate,	RC4state
+ 	1. AESstate,	BFstate
 
-#315. 3 ncsl lines
+#348. 10 ncsl lines
+	9,netssh.c:478,488
+	9,netssh.c:1254,1264
+	4 parameters
+ 	1. closeioproc,	free
+ 	2. io,	buf
+ 	3. stlischan,	writereqremproc
+ 	4. p2,	p
+
+#349. 3 ncsl lines
 	10,pubkey.c:37,39
 	14,transport.c:207,209
 	0 parameters
 
-#316. 3 ncsl lines
-	10,pubkey.c:37,39
+#350. 3 ncsl lines
 	10,pubkey.c:217,219
+	14,transport.c:207,209
 	0 parameters
 
-#317. 3 ncsl lines
+#351. 3 ncsl lines
+	10,pubkey.c:37,39
 	10,pubkey.c:217,219
-	14,transport.c:207,209
 	0 parameters
 
-#318. 4 ncsl lines
+#352. 4 ncsl lines
 	6,dial.c:342,346
 	7,dial.thread.c:344,348
 	0 parameters
 
-#319. 4 ncsl lines
-	5,dh.c:108,111
-	5,dh.c:198,201
+#353. 4 ncsl lines
+	9,netssh.c:2601,2604
+	9,netssh.c:2627,2630
 	1 parameters
- 	1. "no key (ek) found",	"no key (x) found"
+ 	1. "received KEX algs: %s",	"received C2S crypto algs: %s"
 
-#320. 4 ncsl lines
-	5,dh.c:187,190
-	5,dh.c:198,201
+#354. 4 ncsl lines
+	9,netssh.c:2601,2604
+	9,netssh.c:2640,2643
 	1 parameters
- 	1. "no key (y) found",	"no key (x) found"
+ 	1. "received KEX algs: %s",	"received S2C crypto algs: %s"
 
-#321. 4 ncsl lines
-	5,dh.c:180,183
-	5,dh.c:198,201
+#355. 4 ncsl lines
+	9,netssh.c:2601,2604
+	9,netssh.c:2653,2656
 	1 parameters
- 	1. "no key (g) found",	"no key (x) found"
+ 	1. "received KEX algs: %s",	"received C2S MAC algs: %s"
 
-#322. 4 ncsl lines
-	5,dh.c:173,176
-	5,dh.c:198,201
+#356. 4 ncsl lines
+	9,netssh.c:2601,2604
+	9,netssh.c:2666,2669
 	1 parameters
- 	1. "no key (q) found",	"no key (x) found"
+ 	1. "received KEX algs: %s",	"received S2C MAC algs: %s"
 
-#323. 4 ncsl lines
-	5,dh.c:99,102
-	5,dh.c:198,201
+#357. 4 ncsl lines
+	9,netssh.c:2601,2604
+	9,netssh.c:2614,2617
 	1 parameters
- 	1. "no key (n) found",	"no key (x) found"
+ 	1. "received KEX algs: %s",	"received host key algs: %s"
 
-#324. 4 ncsl lines
-	5,dh.c:166,169
-	5,dh.c:198,201
+#358. 5 ncsl lines
+	5,dh.c:204,209
+	5,dh.c:371,376
 	1 parameters
- 	1. "no key (p) found",	"no key (x) found"
-
-#325. 6 ncsl lines
-	5,dh.c:487,492
-	5,dh.c:707,712
-	0 parameters
-
-#326. 3 ncsl lines
-	9,netssh.c:2269,2271
-	9,netssh.c:2509,2511
-	0 parameters
+ 	1. rsa_ks,	dss_ks
 
-#327. 11 ncsl lines
+#359. 11 ncsl lines
 	1,cipheraes.c:29,41
 	1,cipheraes.c:35,47
 	(overlap; region has 3 nonoverlapping matching 5-ncsl-line segments)
@@ -1872,1638 +2043,1493 @@
  	3. initaes192,	initaes256
  	4. 192,	256
 
-#328. 6 ncsl lines
+#360. 6 ncsl lines
 	1,cipheraes.c:29,35
 	1,cipheraes.c:41,47
 	2 parameters
  	1. initaes128,	initaes256
  	2. 128,	256
 
-#329. 5 ncsl lines
+#361. 5 ncsl lines
 	5,dh.c:243,248
 	5,dh.c:387,392
 	1 parameters
  	1. rsa_sign,	dss_sign
 
-#330. 5 ncsl lines
-	5,dh.c:204,209
-	5,dh.c:371,376
-	1 parameters
- 	1. rsa_ks,	dss_ks
-
-#331. 4 ncsl lines
-	9,netssh.c:2074,2078
-	9,netssh.c:2229,2233
-	1 parameters
- 	1. negotiating,	established
-
-#332. 4 ncsl lines
+#362. 4 ncsl lines
 	6,dial.c:204,208
 	7,dial.thread.c:275,284
 	1 parameters
  	1. reap,	dialmulti
 
-#333. 4 ncsl lines
+#363. 4 ncsl lines
 	6,dial.c:216,220
 	6,dial.c:294,303
 	1 parameters
  	1. fillinds,	dialmulti
 
-#334. 6 ncsl lines
-	9,netssh.c:597,603
-	9,netssh.c:924,930
+#364. 4 ncsl lines
+	9,netssh.c:2080,2084
+	9,netssh.c:2235,2239
+	1 parameters
+ 	1. negotiating,	established
+
+#365. 3 ncsl lines
+	9,netssh.c:2275,2277
+	9,netssh.c:2515,2517
+	0 parameters
+
+#366. 6 ncsl lines
+	9,netssh.c:602,608
+	9,netssh.c:929,935
 	2 parameters
  	1. stread,	stwrite
  	2. sc,	ch
 
-#335. 4 ncsl lines
-	9,netssh.c:313,317
-	9,netssh.c:597,601
+#367. 4 ncsl lines
+	9,netssh.c:318,322
+	9,netssh.c:602,606
 	1 parameters
  	1. stopen,	stread
 
-#336. 4 ncsl lines
+#368. 4 ncsl lines
 	12,ssh.c:30,38
 	12,ssh.c:80,84
 	1 parameters
  	1. shutdown,	parseargs
 
-#337. 4 ncsl lines
-	9,netssh.c:2212,2216
-	9,netssh.c:2440,2444
+#369. 4 ncsl lines
+	0,cipher3des.c:35,39
+	1,cipheraes.c:57,61
 	1 parameters
- 	1. nochans,	reader0
+ 	1. decrypt3des,	decryptaes
+
+#370. 4 ncsl lines
+	0,cipher3des.c:35,39
+	1,cipheraes.c:47,51
+	1 parameters
+ 	1. decrypt3des,	encryptaes
 
-#338. 4 ncsl lines
+#371. 4 ncsl lines
 	1,cipheraes.c:57,61
 	2,cipherblowfish.c:49,53
 	1 parameters
  	1. decryptaes,	decryptblowfish
 
-#339. 4 ncsl lines
+#372. 4 ncsl lines
 	1,cipheraes.c:47,51
 	2,cipherblowfish.c:49,53
 	1 parameters
  	1. encryptaes,	decryptblowfish
 
-#340. 4 ncsl lines
-	0,cipher3des.c:35,39
-	1,cipheraes.c:57,61
-	1 parameters
- 	1. decrypt3des,	decryptaes
-
-#341. 4 ncsl lines
-	0,cipher3des.c:35,39
-	1,cipheraes.c:47,51
+#373. 4 ncsl lines
+	9,netssh.c:2218,2222
+	9,netssh.c:2446,2450
 	1 parameters
- 	1. decrypt3des,	encryptaes
+ 	1. nochans,	reader0
 
-#342. 4 ncsl lines
+#374. 4 ncsl lines
 	6,dial.c:142,146
 	7,dial.thread.c:228,233
 	1 parameters
  	1. freedest,	intrcallprocs
 
-#343. 4 ncsl lines
+#375. 4 ncsl lines
 	6,dial.c:142,146
 	7,dial.thread.c:140,144
 	0 parameters
 
-#344. 4 ncsl lines
-	0,cipher3des.c:27,31
+#376. 4 ncsl lines
+	7,dial.thread.c:516,523
 	13,sshsession.c:146,150
 	1 parameters
- 	1. cs,	0
+ 	1. sl,	0
 
-#345. 4 ncsl lines
+#377. 4 ncsl lines
 	6,dial.c:522,529
 	13,sshsession.c:146,150
 	1 parameters
  	1. sl,	0
 
-#346. 4 ncsl lines
-	7,dial.thread.c:516,523
-	13,sshsession.c:146,150
+#378. 4 ncsl lines
+	0,cipher3des.c:27,31
+	7,dial.thread.c:516,523
+	1 parameters
+ 	1. cs,	sl
+
+#379. 4 ncsl lines
+	0,cipher3des.c:27,31
+	6,dial.c:522,529
+	1 parameters
+ 	1. cs,	sl
+
+#380. 4 ncsl lines
+	0,cipher3des.c:27,31
+	13,sshsession.c:146,150
+	1 parameters
+ 	1. cs,	0
+
+#381. 7 ncsl lines
+	9,netssh.c:1275,1281
+	9,netssh.c:1381,1387
+	0 parameters
+
+#382. 6 ncsl lines
+	9,netssh.c:366,371
+	9,netssh.c:942,947
+	1 parameters
+ 	1. "bad connection",	"invalid connection"
+
+#383. 4 ncsl lines
+	9,netssh.c:942,945
+	9,netssh.c:1381,1384
+	1 parameters
+ 	1. "invalid connection",	"Invalid connection"
+
+#384. 4 ncsl lines
+	9,netssh.c:366,369
+	9,netssh.c:1381,1384
+	1 parameters
+ 	1. "bad connection",	"Invalid connection"
+
+#385. 4 ncsl lines
+	9,netssh.c:366,369
+	9,netssh.c:1275,1278
+	1 parameters
+ 	1. "bad connection",	"Invalid connection"
+
+#386. 7 ncsl lines
+	9,netssh.c:498,504
+	9,netssh.c:1085,1092
+	1 parameters
+ 	1. "bad channel",	"bad connection"
+
+#387. 7 ncsl lines
+	9,netssh.c:892,898
+	9,netssh.c:1085,1092
+	0 parameters
+
+#388. 4 ncsl lines
+	9,netssh.c:1085,1089
+	9,netssh.c:1381,1384
+	1 parameters
+ 	1. "bad connection",	"Invalid connection"
+
+#389. 4 ncsl lines
+	9,netssh.c:366,369
+	9,netssh.c:1085,1089
+	0 parameters
+
+#390. 4 ncsl lines
+	9,netssh.c:892,895
+	9,netssh.c:942,945
 	1 parameters
- 	1. sl,	0
+ 	1. "bad connection",	"invalid connection"
 
-#347. 4 ncsl lines
-	0,cipher3des.c:27,31
-	6,dial.c:522,529
+#391. 4 ncsl lines
+	9,netssh.c:498,501
+	9,netssh.c:942,945
 	1 parameters
- 	1. cs,	sl
+ 	1. "bad channel",	"invalid connection"
 
-#348. 4 ncsl lines
-	0,cipher3des.c:27,31
-	7,dial.thread.c:516,523
+#392. 4 ncsl lines
+	9,netssh.c:892,895
+	9,netssh.c:1275,1278
 	1 parameters
- 	1. cs,	sl
+ 	1. "bad connection",	"Invalid connection"
 
-#349. 4 ncsl lines
-	9,netssh.c:1460,1463
-	9,netssh.c:2387,2390
+#393. 4 ncsl lines
+	9,netssh.c:498,501
+	9,netssh.c:1275,1278
 	1 parameters
- 	1. sc,	ch
+ 	1. "bad channel",	"Invalid connection"
 
-#350. 3 ncsl lines
-	9,netssh.c:579,581
-	9,netssh.c:865,867
+#394. 4 ncsl lines
+	9,netssh.c:366,369
+	9,netssh.c:892,895
 	0 parameters
 
-#351. 4 ncsl lines
-	9,netssh.c:2359,2362
-	9,netssh.c:2397,2400
+#395. 4 ncsl lines
+	9,netssh.c:366,369
+	9,netssh.c:498,501
 	1 parameters
- 	1. SSH_MSG_CHANNEL_EOF,	SSH_MSG_CHANNEL_REQUEST
+ 	1. "bad connection",	"bad channel"
 
-#352. 5 ncsl lines
-	9,netssh.c:175,179
-	12,ssh.c:466,470
+#396. 3 ncsl lines
+	9,netssh.c:366,368
+	9,netssh.c:616,618
+	0 parameters
+
+#397. 3 ncsl lines
+	9,netssh.c:616,618
+	9,netssh.c:892,894
+	0 parameters
+
+#398. 3 ncsl lines
+	9,netssh.c:498,500
+	9,netssh.c:616,618
+	0 parameters
+
+#399. 3 ncsl lines
+	9,netssh.c:616,618
+	9,netssh.c:1381,1383
+	0 parameters
+
+#400. 3 ncsl lines
+	9,netssh.c:748,750
+	9,netssh.c:892,894
+	0 parameters
+
+#401. 3 ncsl lines
+	9,netssh.c:498,500
+	9,netssh.c:748,750
+	0 parameters
+
+#402. 3 ncsl lines
+	9,netssh.c:748,750
+	9,netssh.c:1381,1383
+	0 parameters
+
+#403. 3 ncsl lines
+	9,netssh.c:366,368
+	9,netssh.c:748,750
+	0 parameters
+
+#404. 6 ncsl lines
+	5,dh.c:487,492
+	5,dh.c:707,712
+	0 parameters
+
+#405. 4 ncsl lines
+	9,netssh.c:1466,1469
+	9,netssh.c:2393,2396
 	1 parameters
- 	1. 'k',	'I'
+ 	1. sc,	ch
 
-#353. 4 ncsl lines
-	9,netssh.c:377,380
-	9,netssh.c:706,709
+#406. 3 ncsl lines
+	9,netssh.c:584,586
+	9,netssh.c:870,872
 	0 parameters
 
-#354. 3 ncsl lines
-	9,netssh.c:1922,1924
-	9,netssh.c:1995,1997
+#407. 3 ncsl lines
+	9,netssh.c:1928,1930
+	9,netssh.c:2001,2003
 	0 parameters
 
-#355. 3 ncsl lines
+#408. 3 ncsl lines
 	6,dial.c:350,352
 	6,dial.c:374,376
 	0 parameters
 
-#356. 3 ncsl lines
+#409. 3 ncsl lines
 	6,dial.c:350,352
 	7,dial.thread.c:377,379
 	0 parameters
 
-#357. 9 ncsl lines
-	9,netssh.c:1086,1095
-	9,netssh.c:1274,1282
+#410. 9 ncsl lines
+	9,netssh.c:1091,1100
+	9,netssh.c:1279,1287
 	1 parameters
  	1. Numbsz,	10
 
-#358. 3 ncsl lines
-	9,netssh.c:1086,1088
-	9,netssh.c:1379,1381
+#411. 3 ncsl lines
+	9,netssh.c:1091,1093
+	9,netssh.c:1385,1387
 	0 parameters
 
-#359. 4 ncsl lines
-	9,netssh.c:593,596
-	9,netssh.c:866,869
+#412. 4 ncsl lines
+	9,netssh.c:598,601
+	9,netssh.c:871,874
 	1 parameters
  	1. p,	d
 
-#360. 3 ncsl lines
-	9,netssh.c:808,810
-	9,netssh.c:819,821
+#413. 4 ncsl lines
+	12,ssh.c:150,154
+	12,ssh.c:281,286
+	1 parameters
+ 	1. fd,	kconsfd
+
+#414. 3 ncsl lines
+	9,netssh.c:813,815
+	9,netssh.c:824,826
 	0 parameters
 
-#361. 7 ncsl lines
-	9,netssh.c:2876,2882
-	9,netssh.c:2890,2896
+#415. 3 ncsl lines
+	12,ssh.c:186,188
+	12,ssh.c:190,194
 	0 parameters
 
-#362. 4 ncsl lines
+#416. 4 ncsl lines
 	6,dial.c:61,65
 	7,dial.thread.c:64,67
 	1 parameters
  	1. winner,	naddrs
 
-#363. 7 ncsl lines
+#417. 4 ncsl lines
+	9,netssh.c:382,385
+	9,netssh.c:711,714
+	0 parameters
+
+#418. 4 ncsl lines
+	9,netssh.c:2365,2368
+	9,netssh.c:2403,2406
+	1 parameters
+ 	1. SSH_MSG_CHANNEL_EOF,	SSH_MSG_CHANNEL_REQUEST
+
+#419. 5 ncsl lines
+	9,netssh.c:175,179
+	12,ssh.c:499,503
+	1 parameters
+ 	1. 'k',	'I'
+
+#420. 7 ncsl lines
 	12,ssh.c:24,30
 	13,sshsession.c:26,32
 	2 parameters
  	1. "usage: %s [-dkKmr] [-l user] [-n dir] [-z attr=val] addr ",	"usage: %s [-i id] [-s shell] [-r dir] [-R dir] [-S srvpt] "
  	2. "[cmd [args]]\n",	"[-n ns] [-t] [netdir]\n"
 
-#364. 3 ncsl lines
+#421. 3 ncsl lines
 	11,rsa2ssh2.c:15,17
 	13,sshsession.c:26,28
 	0 parameters
 
-#365. 3 ncsl lines
+#422. 3 ncsl lines
 	11,rsa2ssh2.c:15,17
 	12,ssh.c:24,26
 	0 parameters
 
-#366. 3 ncsl lines
-	12,ssh.c:255,257
-	12,ssh.c:296,299
-	0 parameters
+#423. 16 ncsl lines
+	9,netssh.c:2736,2753
+	9,netssh.c:2747,2764
+	(overlap; region has 2 nonoverlapping matching 10-ncsl-line segments)
+	4 parameters
+ 	1. foundc2,	foundm1
+ 	2. nsccrypt,	ncsmac
+ 	3. foundm1,	foundm2
+ 	4. ncsmac,	nscmac
 
-#367. 3 ncsl lines
-	9,netssh.c:2227,2229
-	9,netssh.c:2378,2380
-	0 parameters
+#424. 9 ncsl lines
+	9,netssh.c:2726,2734
+	9,netssh.c:2747,2756
+	3 parameters
+ 	1. foundc1,	foundm1
+ 	2. ncscrypt,	ncsmac
+ 	3. cryptos,	macnames
 
-#368. 3 ncsl lines
-	5,dh.c:572,574
-	9,netssh.c:1204,1206
-	0 parameters
+#425. 9 ncsl lines
+	9,netssh.c:2715,2724
+	9,netssh.c:2747,2756
+	3 parameters
+ 	1. foundpka,	foundm1
+ 	2. pkalg,	ncsmac
+ 	3. cryptos,	macnames
 
-#369. 3 ncsl lines
-	5,dh.c:572,574
-	9,netssh.c:1356,1358
-	0 parameters
+#426. 7 ncsl lines
+	9,netssh.c:2704,2711
+	9,netssh.c:2747,2754
+	2 parameters
+ 	1. foundk,	foundm1
+ 	2. kexalg,	ncsmac
 
-#370. 3 ncsl lines
-	9,netssh.c:1204,1206
-	9,netssh.c:1356,1358
-	0 parameters
+#427. 6 ncsl lines
+	9,netssh.c:2726,2731
+	9,netssh.c:2758,2764
+	2 parameters
+ 	1. foundc1,	foundm2
+ 	2. ncscrypt,	nscmac
 
-#371. 3 ncsl lines
-	9,netssh.c:591,593
-	9,netssh.c:1204,1206
-	0 parameters
+#428. 6 ncsl lines
+	9,netssh.c:2715,2721
+	9,netssh.c:2758,2764
+	2 parameters
+ 	1. foundpka,	foundm2
+ 	2. pkalg,	nscmac
 
-#372. 3 ncsl lines
-	9,netssh.c:1204,1206
-	9,netssh.c:1220,1222
-	0 parameters
+#429. 6 ncsl lines
+	9,netssh.c:2736,2742
+	9,netssh.c:2758,2764
+	2 parameters
+ 	1. foundc2,	foundm2
+ 	2. nsccrypt,	nscmac
 
-#373. 3 ncsl lines
-	5,dh.c:572,574
-	9,netssh.c:591,593
-	0 parameters
+#430. 6 ncsl lines
+	9,netssh.c:2704,2710
+	9,netssh.c:2758,2764
+	2 parameters
+ 	1. foundk,	foundm2
+ 	2. kexalg,	nscmac
 
-#374. 3 ncsl lines
-	5,dh.c:572,574
-	9,netssh.c:1220,1222
-	0 parameters
+#431. 19 ncsl lines
+	9,netssh.c:2646,2666
+	9,netssh.c:2659,2679
+	(overlap; region has 2 nonoverlapping matching 12-ncsl-line segments)
+	7 parameters
+ 	1. foundc2,	foundm1
+ 	2. "s2c crypto algs not in cryptos",	"c2s mac algs not in cryptos"
+ 	3. nsccrypt,	ncsmac
+ 	4. "received C2S MAC algs: %s",	"received S2C MAC algs: %s"
+ 	5. foundm1,	foundm2
+ 	6. "c2s mac algs not in cryptos",	"s2c mac algs not in cryptos"
+ 	7. ncsmac,	nscmac
 
-#375. 3 ncsl lines
-	5,dh.c:572,574
-	5,dh.c:784,786
-	0 parameters
+#432. 10 ncsl lines
+	9,netssh.c:2607,2617
+	9,netssh.c:2659,2669
+	4 parameters
+ 	1. foundk,	foundm1
+ 	2. "kex algs not in kexes",	"c2s mac algs not in cryptos"
+ 	3. kexalg,	ncsmac
+ 	4. "received host key algs: %s",	"received S2C MAC algs: %s"
 
-#376. 3 ncsl lines
-	5,dh.c:784,786
-	9,netssh.c:591,593
-	0 parameters
+#433. 4 ncsl lines
+	5,dh.c:166,169
+	5,dh.c:180,183
+	1 parameters
+ 	1. "no key (p) found",	"no key (g) found"
 
-#377. 3 ncsl lines
-	5,dh.c:784,786
-	9,netssh.c:1220,1222
-	0 parameters
+#434. 4 ncsl lines
+	5,dh.c:166,169
+	5,dh.c:173,176
+	1 parameters
+ 	1. "no key (p) found",	"no key (q) found"
 
-#378. 3 ncsl lines
-	5,dh.c:784,786
-	9,netssh.c:1356,1358
-	0 parameters
+#435. 4 ncsl lines
+	5,dh.c:99,102
+	5,dh.c:166,169
+	1 parameters
+ 	1. "no key (n) found",	"no key (p) found"
 
-#379. 4 ncsl lines
-	9,netssh.c:960,963
-	9,netssh.c:970,973
+#436. 4 ncsl lines
+	5,dh.c:166,169
+	5,dh.c:187,190
 	1 parameters
- 	1. "deferredinit failed",	nil
+ 	1. "no key (p) found",	"no key (y) found"
 
-#380. 4 ncsl lines
-	9,netssh.c:723,726
-	9,netssh.c:960,963
+#437. 4 ncsl lines
+	9,netssh.c:670,673
+	9,netssh.c:975,978
 	1 parameters
- 	1. nil,	"deferredinit failed"
+ 	1. "deferredinit failed",	nil
 
-#381. 4 ncsl lines
-	9,netssh.c:665,668
-	9,netssh.c:723,726
+#438. 4 ncsl lines
+	9,netssh.c:670,673
+	9,netssh.c:728,731
 	1 parameters
  	1. "deferredinit failed",	nil
 
-#382. 4 ncsl lines
-	9,netssh.c:665,668
-	9,netssh.c:970,973
+#439. 4 ncsl lines
+	9,netssh.c:728,731
+	9,netssh.c:965,968
+	1 parameters
+ 	1. nil,	"deferredinit failed"
+
+#440. 4 ncsl lines
+	9,netssh.c:965,968
+	9,netssh.c:975,978
 	1 parameters
  	1. "deferredinit failed",	nil
 
-#383. 3 ncsl lines
-	9,netssh.c:723,725
-	9,netssh.c:836,838
+#441. 3 ncsl lines
+	9,netssh.c:728,730
+	9,netssh.c:874,876
 	0 parameters
 
-#384. 3 ncsl lines
-	9,netssh.c:836,838
-	9,netssh.c:970,972
+#442. 3 ncsl lines
+	9,netssh.c:874,876
+	9,netssh.c:975,977
 	0 parameters
 
-#385. 3 ncsl lines
-	9,netssh.c:723,725
-	9,netssh.c:954,956
+#443. 3 ncsl lines
+	9,netssh.c:663,665
+	9,netssh.c:728,730
 	0 parameters
 
-#386. 3 ncsl lines
-	9,netssh.c:954,956
-	9,netssh.c:970,972
+#444. 3 ncsl lines
+	9,netssh.c:663,665
+	9,netssh.c:975,977
 	0 parameters
 
-#387. 3 ncsl lines
-	9,netssh.c:650,652
-	9,netssh.c:723,725
+#445. 3 ncsl lines
+	9,netssh.c:676,678
+	9,netssh.c:728,730
 	0 parameters
 
-#388. 3 ncsl lines
-	9,netssh.c:650,652
-	9,netssh.c:970,972
+#446. 3 ncsl lines
+	9,netssh.c:676,678
+	9,netssh.c:975,977
 	0 parameters
 
-#389. 3 ncsl lines
-	9,netssh.c:628,630
-	9,netssh.c:723,725
+#447. 3 ncsl lines
+	9,netssh.c:655,657
+	9,netssh.c:728,730
 	0 parameters
 
-#390. 3 ncsl lines
-	9,netssh.c:628,630
-	9,netssh.c:970,972
+#448. 3 ncsl lines
+	9,netssh.c:655,657
+	9,netssh.c:975,977
 	0 parameters
 
-#391. 3 ncsl lines
-	9,netssh.c:658,660
-	9,netssh.c:723,725
+#449. 3 ncsl lines
+	9,netssh.c:633,635
+	9,netssh.c:728,730
 	0 parameters
 
-#392. 3 ncsl lines
-	9,netssh.c:658,660
-	9,netssh.c:970,972
+#450. 3 ncsl lines
+	9,netssh.c:633,635
+	9,netssh.c:975,977
 	0 parameters
 
-#393. 3 ncsl lines
-	9,netssh.c:723,725
-	9,netssh.c:869,871
+#451. 3 ncsl lines
+	9,netssh.c:728,730
+	9,netssh.c:959,961
 	0 parameters
 
-#394. 3 ncsl lines
-	9,netssh.c:869,871
-	9,netssh.c:970,972
+#452. 3 ncsl lines
+	9,netssh.c:959,961
+	9,netssh.c:975,977
 	0 parameters
 
-#395. 3 ncsl lines
-	9,netssh.c:671,673
-	9,netssh.c:723,725
+#453. 3 ncsl lines
+	9,netssh.c:728,730
+	9,netssh.c:841,843
 	0 parameters
 
-#396. 3 ncsl lines
-	9,netssh.c:671,673
-	9,netssh.c:970,972
+#454. 3 ncsl lines
+	9,netssh.c:841,843
+	9,netssh.c:975,977
 	0 parameters
 
-#397. 4 ncsl lines
-	5,dh.c:166,169
-	5,dh.c:187,190
-	1 parameters
- 	1. "no key (p) found",	"no key (y) found"
-
-#398. 4 ncsl lines
-	5,dh.c:166,169
-	5,dh.c:180,183
-	1 parameters
- 	1. "no key (p) found",	"no key (g) found"
-
-#399. 4 ncsl lines
-	5,dh.c:166,169
-	5,dh.c:173,176
-	1 parameters
- 	1. "no key (p) found",	"no key (q) found"
-
-#400. 4 ncsl lines
-	5,dh.c:99,102
-	5,dh.c:166,169
-	1 parameters
- 	1. "no key (n) found",	"no key (p) found"
-
-#401. 4 ncsl lines
-	9,netssh.c:1316,1319
-	9,netssh.c:1333,1336
+#455. 4 ncsl lines
+	9,netssh.c:1321,1324
+	9,netssh.c:1338,1341
 	1 parameters
  	1. "pty-req",	"shell"
 
-#402. 4 ncsl lines
-	9,netssh.c:1333,1336
-	9,netssh.c:1341,1344
+#456. 4 ncsl lines
+	9,netssh.c:1338,1341
+	9,netssh.c:1346,1349
 	1 parameters
  	1. "shell",	"exec"
 
-#403. 3 ncsl lines
+#457. 3 ncsl lines
 	5,dh.c:502,504
 	5,dh.c:718,720
 	0 parameters
 
-#404. 16 ncsl lines
-	9,netssh.c:2730,2747
-	9,netssh.c:2741,2758
-	(overlap; region has 2 nonoverlapping matching 10-ncsl-line segments)
-	4 parameters
- 	1. foundc2,	foundm1
- 	2. nsccrypt,	ncsmac
- 	3. foundm1,	foundm2
- 	4. ncsmac,	nscmac
+#458. 3 ncsl lines
+	9,netssh.c:2233,2235
+	9,netssh.c:2384,2386
+	0 parameters
 
-#405. 9 ncsl lines
-	9,netssh.c:2720,2728
-	9,netssh.c:2741,2750
-	3 parameters
- 	1. foundc1,	foundm1
- 	2. ncscrypt,	ncsmac
- 	3. cryptos,	macnames
+#459. 3 ncsl lines
+	9,netssh.c:1209,1211
+	9,netssh.c:1362,1364
+	0 parameters
 
-#406. 9 ncsl lines
-	9,netssh.c:2709,2718
-	9,netssh.c:2741,2750
-	3 parameters
- 	1. foundpka,	foundm1
- 	2. pkalg,	ncsmac
- 	3. cryptos,	macnames
+#460. 3 ncsl lines
+	9,netssh.c:1209,1211
+	9,netssh.c:1225,1227
+	0 parameters
 
-#407. 7 ncsl lines
-	9,netssh.c:2698,2705
-	9,netssh.c:2741,2748
-	2 parameters
- 	1. foundk,	foundm1
- 	2. kexalg,	ncsmac
+#461. 3 ncsl lines
+	9,netssh.c:596,598
+	9,netssh.c:1209,1211
+	0 parameters
 
-#408. 6 ncsl lines
-	9,netssh.c:2730,2736
-	9,netssh.c:2752,2758
-	2 parameters
- 	1. foundc2,	foundm2
- 	2. nsccrypt,	nscmac
+#462. 3 ncsl lines
+	5,dh.c:784,786
+	9,netssh.c:1225,1227
+	0 parameters
 
-#409. 6 ncsl lines
-	9,netssh.c:2720,2725
-	9,netssh.c:2752,2758
-	2 parameters
- 	1. foundc1,	foundm2
- 	2. ncscrypt,	nscmac
+#463. 3 ncsl lines
+	5,dh.c:784,786
+	9,netssh.c:596,598
+	0 parameters
 
-#410. 6 ncsl lines
-	9,netssh.c:2709,2715
-	9,netssh.c:2752,2758
-	2 parameters
- 	1. foundpka,	foundm2
- 	2. pkalg,	nscmac
+#464. 3 ncsl lines
+	5,dh.c:784,786
+	9,netssh.c:1362,1364
+	0 parameters
 
-#411. 6 ncsl lines
-	9,netssh.c:2698,2704
-	9,netssh.c:2752,2758
-	2 parameters
- 	1. foundk,	foundm2
- 	2. kexalg,	nscmac
+#465. 3 ncsl lines
+	5,dh.c:572,574
+	9,netssh.c:1225,1227
+	0 parameters
 
-#412. 19 ncsl lines
-	9,netssh.c:2640,2660
-	9,netssh.c:2653,2673
-	(overlap; region has 2 nonoverlapping matching 12-ncsl-line segments)
-	7 parameters
- 	1. foundc2,	foundm1
- 	2. "s2c crypto algs not in cryptos",	"c2s mac algs not in cryptos"
- 	3. nsccrypt,	ncsmac
- 	4. "received C2S MAC algs: %s",	"received S2C MAC algs: %s"
- 	5. foundm1,	foundm2
- 	6. "c2s mac algs not in cryptos",	"s2c mac algs not in cryptos"
- 	7. ncsmac,	nscmac
+#466. 3 ncsl lines
+	5,dh.c:572,574
+	9,netssh.c:596,598
+	0 parameters
 
-#413. 10 ncsl lines
-	9,netssh.c:2601,2611
-	9,netssh.c:2653,2663
-	4 parameters
- 	1. foundk,	foundm1
- 	2. "kex algs not in kexes",	"c2s mac algs not in cryptos"
- 	3. kexalg,	ncsmac
- 	4. "received host key algs: %s",	"received S2C MAC algs: %s"
+#467. 3 ncsl lines
+	5,dh.c:572,574
+	9,netssh.c:1362,1364
+	0 parameters
+
+#468. 3 ncsl lines
+	5,dh.c:572,574
+	5,dh.c:784,786
+	0 parameters
 
-#414. 3 ncsl lines
-	9,netssh.c:1856,1860
-	9,netssh.c:1965,1969
+#469. 3 ncsl lines
+	5,dh.c:572,574
+	9,netssh.c:1209,1211
 	0 parameters
 
-#415. 3 ncsl lines
-	9,netssh.c:828,830
-	9,netssh.c:835,837
+#470. 3 ncsl lines
+	6,dial.c:202,204
+	9,netssh.c:2685,2687
 	0 parameters
 
-#416. 5 ncsl lines
-	9,netssh.c:1311,1319
-	9,netssh.c:1340,1344
-	1 parameters
- 	1. "pty-req",	"exec"
+#471. 6 ncsl lines
+	5,dh.c:550,556
+	5,dh.c:767,773
+	2 parameters
+ 	1. ret,	retval
+ 	2. dh_client11,	dh_client141
 
-#417. 5 ncsl lines
-	9,netssh.c:1802,1813
-	9,netssh.c:1830,1836
+#472. 5 ncsl lines
+	9,netssh.c:1808,1819
+	9,netssh.c:1836,1842
 	1 parameters
  	1. negotiate,	deferredinit
 
-#418. 3 ncsl lines
-	5,dh.c:575,578
+#473. 3 ncsl lines
+	5,dh.c:617,620
 	6,dial.c:203,206
 	0 parameters
 
-#419. 3 ncsl lines
-	5,dh.c:436,439
+#474. 3 ncsl lines
+	5,dh.c:789,792
 	6,dial.c:203,206
 	0 parameters
 
-#420. 3 ncsl lines
-	5,dh.c:789,792
+#475. 3 ncsl lines
+	5,dh.c:436,439
 	6,dial.c:203,206
 	0 parameters
 
-#421. 6 ncsl lines
-	5,dh.c:550,556
-	5,dh.c:767,773
-	2 parameters
- 	1. ret,	retval
- 	2. dh_client11,	dh_client141
-
-#422. 3 ncsl lines
-	5,dh.c:617,620
+#476. 3 ncsl lines
+	5,dh.c:575,578
 	6,dial.c:203,206
 	0 parameters
 
-#423. 3 ncsl lines
+#477. 3 ncsl lines
 	13,sshsession.c:439,442
 	14,transport.c:105,108
 	0 parameters
 
-#424. 3 ncsl lines
-	9,netssh.c:2680,2683
-	9,netssh.c:2920,2923
-	0 parameters
-
-#425. 3 ncsl lines
-	6,dial.c:202,204
-	9,netssh.c:2679,2681
+#478. 3 ncsl lines
+	9,netssh.c:2686,2689
+	9,netssh.c:2926,2929
 	0 parameters
 
-#426. 6 ncsl lines
-	9,netssh.c:935,940
-	9,netssh.c:1268,1273
-	1 parameters
- 	1. "invalid connection",	"Invalid connection"
-
-#427. 6 ncsl lines
-	9,netssh.c:935,940
-	9,netssh.c:1078,1084
+#479. 5 ncsl lines
+	9,netssh.c:1316,1324
+	9,netssh.c:1345,1349
 	1 parameters
- 	1. "invalid connection",	"bad connection"
+ 	1. "pty-req",	"exec"
 
-#428. 5 ncsl lines
-	9,netssh.c:741,745
-	9,netssh.c:935,939
+#480. 3 ncsl lines
+	9,netssh.c:833,835
+	9,netssh.c:840,842
 	0 parameters
 
-#429. 5 ncsl lines
-	9,netssh.c:609,613
-	9,netssh.c:1078,1083
+#481. 3 ncsl lines
+	9,netssh.c:1862,1866
+	9,netssh.c:1971,1975
 	0 parameters
 
-#430. 5 ncsl lines
-	9,netssh.c:609,613
-	9,netssh.c:1268,1272
+#482. 3 ncsl lines
+	9,netssh.c:1804,1806
+	14,transport.c:207,209
 	0 parameters
 
-#431. 5 ncsl lines
-	9,netssh.c:609,613
-	9,netssh.c:741,745
+#483. 3 ncsl lines
+	9,netssh.c:1804,1806
+	10,pubkey.c:37,39
 	0 parameters
 
-#432. 3 ncsl lines
-	9,netssh.c:1798,1800
+#484. 3 ncsl lines
+	9,netssh.c:1804,1806
 	10,pubkey.c:217,219
 	0 parameters
 
-#433. 3 ncsl lines
-	9,netssh.c:1798,1800
-	14,transport.c:207,209
-	0 parameters
-
-#434. 3 ncsl lines
-	9,netssh.c:1798,1800
-	10,pubkey.c:37,39
+#485. 7 ncsl lines
+	9,netssh.c:2882,2888
+	9,netssh.c:2896,2902
 	0 parameters
 
-#435. 6 ncsl lines
+#486. 6 ncsl lines
 	5,dh.c:19,24
 	5,dh.c:30,35
 	2 parameters
  	1. group1p,	group14p
  	2. "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381",	"EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
 
-#436. 5 ncsl lines
+#487. 5 ncsl lines
 	5,dh.c:98,102
 	5,dh.c:165,169
 	1 parameters
  	1. "no key (n) found",	"no key (p) found"
 
-#437. 5 ncsl lines
+#488. 5 ncsl lines
 	5,dh.c:107,111
 	5,dh.c:186,190
 	1 parameters
  	1. "no key (ek) found",	"no key (y) found"
 
-#438. 5 ncsl lines
+#489. 5 ncsl lines
 	5,dh.c:107,111
 	5,dh.c:179,183
 	1 parameters
  	1. "no key (ek) found",	"no key (g) found"
 
-#439. 5 ncsl lines
+#490. 5 ncsl lines
 	5,dh.c:107,111
 	5,dh.c:172,176
 	1 parameters
  	1. "no key (ek) found",	"no key (q) found"
 
-#440. 5 ncsl lines
+#491. 5 ncsl lines
 	5,dh.c:107,111
 	5,dh.c:165,169
 	1 parameters
  	1. "no key (ek) found",	"no key (p) found"
 
-#441. 4 ncsl lines
-	6,dial.c:226,229
-	7,dial.thread.c:328,331
-	0 parameters
-
-#442. 3 ncsl lines
-	13,sshsession.c:409,411
-	13,sshsession.c:438,440
-	0 parameters
-
-#443. 11 ncsl lines
-	9,netssh.c:2707,2718
-	9,netssh.c:2728,2739
+#492. 11 ncsl lines
+	9,netssh.c:2713,2724
+	9,netssh.c:2734,2745
 	4 parameters
  	1. pkas,	cryptos
  	2. foundpka,	foundc2
  	3. pkalg,	nsccrypt
  	4. cryptos,	macnames
 
-#444. 9 ncsl lines
-	9,netssh.c:2707,2716
-	9,netssh.c:2718,2726
+#493. 9 ncsl lines
+	9,netssh.c:2713,2722
+	9,netssh.c:2724,2732
 	3 parameters
  	1. pkas,	cryptos
  	2. foundpka,	foundc1
  	3. pkalg,	ncscrypt
 
-#445. 9 ncsl lines
-	9,netssh.c:2696,2705
-	9,netssh.c:2707,2716
+#494. 9 ncsl lines
+	9,netssh.c:2702,2711
+	9,netssh.c:2713,2722
 	3 parameters
  	1. kexes,	pkas
  	2. foundk,	foundpka
  	3. kexalg,	pkalg
 
-#446. 7 ncsl lines
-	9,netssh.c:1270,1276
-	9,netssh.c:1375,1381
+#495. 3 ncsl lines
+	13,sshsession.c:409,411
+	13,sshsession.c:438,440
 	0 parameters
 
-#447. 6 ncsl lines
-	9,netssh.c:361,366
-	9,netssh.c:937,942
-	1 parameters
- 	1. "bad connection",	"invalid connection"
-
-#448. 4 ncsl lines
-	9,netssh.c:937,940
-	9,netssh.c:1375,1378
-	1 parameters
- 	1. "invalid connection",	"Invalid connection"
-
-#449. 4 ncsl lines
-	9,netssh.c:361,364
-	9,netssh.c:1270,1273
-	1 parameters
- 	1. "bad connection",	"Invalid connection"
-
-#450. 4 ncsl lines
-	9,netssh.c:361,364
-	9,netssh.c:1375,1378
-	1 parameters
- 	1. "bad connection",	"Invalid connection"
-
-#451. 7 ncsl lines
-	9,netssh.c:493,499
-	9,netssh.c:1080,1087
-	1 parameters
- 	1. "bad channel",	"bad connection"
-
-#452. 7 ncsl lines
-	9,netssh.c:887,893
-	9,netssh.c:1080,1087
+#496. 4 ncsl lines
+	6,dial.c:226,229
+	7,dial.thread.c:328,331
 	0 parameters
 
-#453. 4 ncsl lines
-	9,netssh.c:1080,1084
-	9,netssh.c:1375,1378
-	1 parameters
- 	1. "bad connection",	"Invalid connection"
-
-#454. 4 ncsl lines
-	9,netssh.c:361,364
-	9,netssh.c:1080,1084
+#497. 5 ncsl lines
+	9,netssh.c:614,618
+	9,netssh.c:746,750
 	0 parameters
 
-#455. 4 ncsl lines
-	9,netssh.c:887,890
-	9,netssh.c:937,940
-	1 parameters
- 	1. "bad connection",	"invalid connection"
-
-#456. 4 ncsl lines
-	9,netssh.c:493,496
-	9,netssh.c:937,940
-	1 parameters
- 	1. "bad channel",	"invalid connection"
-
-#457. 4 ncsl lines
-	9,netssh.c:887,890
-	9,netssh.c:1270,1273
-	1 parameters
- 	1. "bad connection",	"Invalid connection"
-
-#458. 4 ncsl lines
-	9,netssh.c:493,496
-	9,netssh.c:1270,1273
+#498. 6 ncsl lines
+	9,netssh.c:940,945
+	9,netssh.c:1273,1278
 	1 parameters
- 	1. "bad channel",	"Invalid connection"
-
-#459. 4 ncsl lines
-	9,netssh.c:361,364
-	9,netssh.c:887,890
-	0 parameters
+ 	1. "invalid connection",	"Invalid connection"
 
-#460. 4 ncsl lines
-	9,netssh.c:361,364
-	9,netssh.c:493,496
+#499. 6 ncsl lines
+	9,netssh.c:940,945
+	9,netssh.c:1083,1089
 	1 parameters
- 	1. "bad connection",	"bad channel"
-
-#461. 3 ncsl lines
-	9,netssh.c:361,363
-	9,netssh.c:743,745
-	0 parameters
-
-#462. 3 ncsl lines
-	9,netssh.c:361,363
-	9,netssh.c:611,613
-	0 parameters
-
-#463. 3 ncsl lines
-	9,netssh.c:743,745
-	9,netssh.c:887,889
-	0 parameters
-
-#464. 3 ncsl lines
-	9,netssh.c:493,495
-	9,netssh.c:743,745
-	0 parameters
-
-#465. 3 ncsl lines
-	9,netssh.c:743,745
-	9,netssh.c:1375,1377
-	0 parameters
-
-#466. 3 ncsl lines
-	9,netssh.c:611,613
-	9,netssh.c:887,889
-	0 parameters
-
-#467. 3 ncsl lines
-	9,netssh.c:493,495
-	9,netssh.c:611,613
-	0 parameters
-
-#468. 3 ncsl lines
-	9,netssh.c:611,613
-	9,netssh.c:1375,1377
-	0 parameters
+ 	1. "invalid connection",	"bad connection"
 
-#469. 4 ncsl lines
-	5,dh.c:506,509
-	5,dh.c:723,726
+#500. 5 ncsl lines
+	9,netssh.c:746,750
+	9,netssh.c:940,944
 	0 parameters
 
-#470. 4 ncsl lines
-	5,dh.c:549,553
-	9,netssh.c:1687,1691
-	1 parameters
- 	1. ret,	sc
-
-#471. 5 ncsl lines
-	9,netssh.c:2165,2169
-	9,netssh.c:2538,2542
-	1 parameters
- 	1. SSH_MSG_SERVICE_REQUEST,	SSH_MSG_USERAUTH_SUCCESS
-
-#472. 3 ncsl lines
-	9,netssh.c:2155,2157
-	9,netssh.c:2538,2540
+#501. 5 ncsl lines
+	9,netssh.c:614,618
+	9,netssh.c:1083,1088
 	0 parameters
 
-#473. 3 ncsl lines
-	9,netssh.c:2205,2207
-	9,netssh.c:2538,2540
+#502. 5 ncsl lines
+	9,netssh.c:614,618
+	9,netssh.c:1273,1277
 	0 parameters
 
-#474. 3 ncsl lines
-	9,netssh.c:1205,1207
-	9,netssh.c:1478,1481
+#503. 7 ncsl lines
+	5,dh.c:90,96
+	5,dh.c:157,163
 	0 parameters
 
-#475. 3 ncsl lines
-	12,ssh.c:219,221
-	12,ssh.c:448,450
+#504. 3 ncsl lines
+	7,dial.thread.c:158,161
+	9,netssh.c:977,980
 	0 parameters
 
-#476. 3 ncsl lines
-	6,dial.c:191,195
+#505. 3 ncsl lines
+	9,netssh.c:977,980
 	13,sshsession.c:117,120
 	0 parameters
 
-#477. 3 ncsl lines
-	9,netssh.c:972,975
-	13,sshsession.c:117,120
+#506. 3 ncsl lines
+	6,dial.c:191,195
+	7,dial.thread.c:158,161
 	0 parameters
 
-#478. 3 ncsl lines
+#507. 3 ncsl lines
 	6,dial.c:191,195
-	9,netssh.c:972,975
+	13,sshsession.c:117,120
 	0 parameters
 
-#479. 3 ncsl lines
+#508. 3 ncsl lines
 	6,dial.c:191,195
-	7,dial.thread.c:158,161
+	9,netssh.c:977,980
 	0 parameters
 
-#480. 3 ncsl lines
-	7,dial.thread.c:158,161
-	9,netssh.c:972,975
+#509. 3 ncsl lines
+	9,netssh.c:730,733
+	9,netssh.c:1501,1504
 	0 parameters
 
-#481. 3 ncsl lines
-	12,ssh.c:449,452
+#510. 3 ncsl lines
+	9,netssh.c:730,733
 	13,sshsession.c:328,331
 	0 parameters
 
-#482. 3 ncsl lines
-	9,netssh.c:725,728
-	9,netssh.c:1495,1498
+#511. 3 ncsl lines
+	9,netssh.c:730,733
+	12,ssh.c:472,475
 	0 parameters
 
-#483. 3 ncsl lines
-	9,netssh.c:725,728
-	12,ssh.c:449,452
+#512. 3 ncsl lines
+	7,dial.thread.c:149,152
+	9,netssh.c:386,389
 	0 parameters
 
-#484. 3 ncsl lines
-	9,netssh.c:725,728
-	13,sshsession.c:328,331
+#513. 3 ncsl lines
+	9,netssh.c:386,389
+	12,ssh.c:151,154
 	0 parameters
 
-#485. 3 ncsl lines
-	9,netssh.c:1495,1498
-	12,ssh.c:449,452
+#514. 3 ncsl lines
+	9,netssh.c:386,389
+	13,sshsession.c:302,305
 	0 parameters
 
-#486. 3 ncsl lines
-	9,netssh.c:2554,2557
-	12,ssh.c:449,452
+#515. 3 ncsl lines
+	9,netssh.c:386,389
+	12,ssh.c:112,116
 	0 parameters
 
-#487. 3 ncsl lines
+#516. 3 ncsl lines
 	6,dial.c:164,167
-	12,ssh.c:220,223
-	0 parameters
-
-#488. 3 ncsl lines
-	12,ssh.c:220,223
-	12,ssh.c:259,263
+	9,netssh.c:386,389
 	0 parameters
 
-#489. 3 ncsl lines
-	12,ssh.c:112,116
-	12,ssh.c:220,223
+#517. 3 ncsl lines
+	9,netssh.c:386,389
+	12,ssh.c:243,246
 	0 parameters
 
-#490. 3 ncsl lines
-	12,ssh.c:220,223
-	13,sshsession.c:302,305
+#518. 3 ncsl lines
+	6,dial.c:164,167
+	12,ssh.c:243,246
 	0 parameters
 
-#491. 3 ncsl lines
-	7,dial.thread.c:149,152
-	12,ssh.c:220,223
+#519. 3 ncsl lines
+	12,ssh.c:112,116
+	12,ssh.c:243,246
 	0 parameters
 
-#492. 3 ncsl lines
-	9,netssh.c:381,384
-	12,ssh.c:220,223
+#520. 3 ncsl lines
+	12,ssh.c:243,246
+	13,sshsession.c:302,305
 	0 parameters
 
-#493. 3 ncsl lines
+#521. 3 ncsl lines
 	7,dial.thread.c:149,152
-	9,netssh.c:381,384
-	0 parameters
-
-#494. 3 ncsl lines
-	9,netssh.c:381,384
-	13,sshsession.c:302,305
+	12,ssh.c:243,246
 	0 parameters
 
-#495. 3 ncsl lines
-	9,netssh.c:381,384
-	12,ssh.c:112,116
+#522. 3 ncsl lines
+	12,ssh.c:151,154
+	12,ssh.c:243,246
 	0 parameters
 
-#496. 3 ncsl lines
-	9,netssh.c:381,384
-	12,ssh.c:259,263
+#523. 3 ncsl lines
+	9,netssh.c:386,389
+	12,ssh.c:282,286
 	0 parameters
 
-#497. 3 ncsl lines
-	6,dial.c:164,167
-	9,netssh.c:381,384
+#524. 3 ncsl lines
+	12,ssh.c:243,246
+	12,ssh.c:282,286
 	0 parameters
 
-#498. 3 ncsl lines
-	9,netssh.c:793,795
-	9,netssh.c:1245,1247
+#525. 3 ncsl lines
+	9,netssh.c:798,800
+	12,ssh.c:332,334
 	0 parameters
 
-#499. 3 ncsl lines
-	9,netssh.c:793,795
-	12,ssh.c:309,311
+#526. 3 ncsl lines
+	9,netssh.c:798,800
+	9,netssh.c:2214,2216
 	0 parameters
 
-#500. 3 ncsl lines
-	9,netssh.c:793,795
-	9,netssh.c:2208,2210
+#527. 3 ncsl lines
+	9,netssh.c:798,800
+	9,netssh.c:1250,1252
 	0 parameters
 
-#501. 4 ncsl lines
-	13,sshsession.c:398,402
-	13,sshsession.c:411,415
-	1 parameters
- 	1. get_string,	confine
-
-#502. 4 ncsl lines
-	6,dial.c:255,259
-	7,dial.thread.c:273,282
-	1 parameters
- 	1. winner,	windfd
-
-#503. 4 ncsl lines
+#528. 4 ncsl lines
 	6,dial.c:193,197
 	6,dial.c:204,208
 	1 parameters
  	1. outstandingprocs,	reap
 
-#504. 4 ncsl lines
+#529. 4 ncsl lines
 	6,dial.c:193,197
 	7,dial.thread.c:275,284
 	1 parameters
  	1. outstandingprocs,	dialmulti
 
-#505. 19 ncsl lines
+#530. 19 ncsl lines
 	6,dial.c:257,278
 	7,dial.thread.c:159,180
 	0 parameters
 
-#506. 6 ncsl lines
-	9,netssh.c:123,129
-	9,netssh.c:139,145
-	1 parameters
- 	1. sshlog,	sshdebug
-
-#507. 4 ncsl lines
-	9,netssh.c:392,396
-	9,netssh.c:726,730
-	1 parameters
- 	1. stlisconn,	readreqrem
-
-#508. 4 ncsl lines
-	9,netssh.c:392,396
-	9,netssh.c:2555,2559
-	1 parameters
- 	1. stlisconn,	reader
-
-#509. 4 ncsl lines
-	9,netssh.c:924,928
-	9,netssh.c:1496,1500
+#531. 4 ncsl lines
+	9,netssh.c:929,933
+	9,netssh.c:1502,1506
 	1 parameters
  	1. stwrite,	stflush
 
-#510. 4 ncsl lines
-	9,netssh.c:597,601
-	9,netssh.c:1496,1500
+#532. 4 ncsl lines
+	9,netssh.c:602,606
+	9,netssh.c:1502,1506
 	1 parameters
  	1. stread,	stflush
 
-#511. 4 ncsl lines
-	9,netssh.c:313,317
-	9,netssh.c:1496,1500
+#533. 4 ncsl lines
+	9,netssh.c:318,322
+	9,netssh.c:1502,1506
 	1 parameters
  	1. stopen,	stflush
 
-#512. 4 ncsl lines
+#534. 4 ncsl lines
 	14,transport.c:22,26
 	14,transport.c:214,218
 	1 parameters
  	1. init_packet,	dump_packet
 
-#513. 4 ncsl lines
+#535. 4 ncsl lines
+	9,netssh.c:397,401
+	9,netssh.c:731,735
+	1 parameters
+ 	1. stlisconn,	readreqrem
+
+#536. 4 ncsl lines
+	9,netssh.c:397,401
+	9,netssh.c:2561,2565
+	1 parameters
+ 	1. stlisconn,	reader
+
+#537. 4 ncsl lines
 	11,rsa2ssh2.c:20,24
-	12,ssh.c:450,454
+	12,ssh.c:473,477
 	0 parameters
 
-#514. 4 ncsl lines
+#538. 4 ncsl lines
 	9,netssh.c:164,168
-	12,ssh.c:450,454
+	12,ssh.c:473,477
 	1 parameters
  	1. threadmain,	main
 
-#515. 10 ncsl lines
-	9,netssh.c:213,224
-	9,netssh.c:222,233
-	(overlap; region has 2 nonoverlapping matching 8-ncsl-line segments)
-	3 parameters
- 	1. readio,	writeio
- 	2. ioread,	iowrite
- 	3. read,	write
-
-#516. 11 ncsl lines
-	9,netssh.c:2582,2595
-	9,netssh.c:2681,2693
-	1 parameters
- 	1. validatekexs,	validatekexc
-
-#517. 4 ncsl lines
-	12,ssh.c:30,38
-	12,ssh.c:148,152
+#539. 6 ncsl lines
+	9,netssh.c:123,129
+	9,netssh.c:139,145
 	1 parameters
- 	1. shutdown,	starttunnel
+ 	1. sshlog,	sshdebug
 
-#518. 4 ncsl lines
-	12,ssh.c:80,84
-	12,ssh.c:148,152
+#540. 4 ncsl lines
+	6,dial.c:255,259
+	7,dial.thread.c:273,282
 	1 parameters
- 	1. parseargs,	starttunnel
+ 	1. winner,	windfd
 
-#519. 4 ncsl lines
-	12,ssh.c:260,265
-	12,ssh.c:314,322
+#541. 4 ncsl lines
+	12,ssh.c:283,288
+	12,ssh.c:337,345
 	1 parameters
  	1. keyproc,	bidircopy
 
-#520. 9 ncsl lines
-	6,dial.c:156,165
-	7,dial.thread.c:150,159
-	0 parameters
-
-#521. 6 ncsl lines
+#542. 6 ncsl lines
 	3,cipherrc4.c:25,31
 	3,cipherrc4.c:31,37
 	1 parameters
  	1. encryptrc4,	decryptrc4
 
-#522. 10 ncsl lines
+#543. 10 ncsl lines
 	1,cipheraes.c:47,57
 	1,cipheraes.c:57,67
 	2 parameters
  	1. encryptaes,	decryptaes
  	2. aesCBCencrypt,	aesCBCdecrypt
 
-#523. 4 ncsl lines
-	1,cipheraes.c:57,61
-	3,cipherrc4.c:25,29
-	1 parameters
- 	1. decryptaes,	encryptrc4
-
-#524. 4 ncsl lines
+#544. 4 ncsl lines
 	1,cipheraes.c:47,51
-	3,cipherrc4.c:25,29
+	3,cipherrc4.c:31,35
 	1 parameters
- 	1. encryptaes,	encryptrc4
+ 	1. encryptaes,	decryptrc4
 
-#525. 4 ncsl lines
+#545. 4 ncsl lines
 	1,cipheraes.c:57,61
 	3,cipherrc4.c:31,35
 	1 parameters
  	1. decryptaes,	decryptrc4
 
-#526. 4 ncsl lines
+#546. 4 ncsl lines
 	1,cipheraes.c:47,51
-	3,cipherrc4.c:31,35
+	3,cipherrc4.c:25,29
 	1 parameters
- 	1. encryptaes,	decryptrc4
+ 	1. encryptaes,	encryptrc4
 
-#527. 4 ncsl lines
-	2,cipherblowfish.c:49,53
-	3,cipherrc4.c:31,35
+#547. 4 ncsl lines
+	1,cipheraes.c:57,61
+	3,cipherrc4.c:25,29
 	1 parameters
- 	1. decryptblowfish,	decryptrc4
+ 	1. decryptaes,	encryptrc4
 
-#528. 4 ncsl lines
+#548. 4 ncsl lines
 	2,cipherblowfish.c:49,53
 	3,cipherrc4.c:25,29
 	1 parameters
  	1. decryptblowfish,	encryptrc4
 
-#529. 6 ncsl lines
+#549. 4 ncsl lines
+	2,cipherblowfish.c:49,53
+	3,cipherrc4.c:31,35
+	1 parameters
+ 	1. decryptblowfish,	decryptrc4
+
+#550. 6 ncsl lines
 	0,cipher3des.c:29,35
 	0,cipher3des.c:35,41
 	2 parameters
  	1. encrypt3des,	decrypt3des
  	2. des3CBCencrypt,	des3CBCdecrypt
 
-#530. 6 ncsl lines
+#551. 6 ncsl lines
 	0,cipher3des.c:35,41
 	2,cipherblowfish.c:43,49
 	2 parameters
  	1. decrypt3des,	encryptblowfish
  	2. des3CBCdecrypt,	bfCBCencrypt
 
-#531. 4 ncsl lines
+#552. 4 ncsl lines
 	0,cipher3des.c:29,33
 	3,cipherrc4.c:31,35
 	1 parameters
  	1. encrypt3des,	decryptrc4
 
-#532. 4 ncsl lines
+#553. 4 ncsl lines
 	2,cipherblowfish.c:43,47
 	3,cipherrc4.c:31,35
 	1 parameters
  	1. encryptblowfish,	decryptrc4
 
-#533. 4 ncsl lines
+#554. 4 ncsl lines
 	0,cipher3des.c:29,33
 	2,cipherblowfish.c:49,53
 	1 parameters
  	1. encrypt3des,	decryptblowfish
 
-#534. 4 ncsl lines
+#555. 4 ncsl lines
 	2,cipherblowfish.c:43,47
 	2,cipherblowfish.c:49,53
 	1 parameters
  	1. encryptblowfish,	decryptblowfish
 
-#535. 4 ncsl lines
+#556. 4 ncsl lines
 	0,cipher3des.c:29,33
-	1,cipheraes.c:57,61
+	1,cipheraes.c:47,51
 	1 parameters
- 	1. encrypt3des,	decryptaes
+ 	1. encrypt3des,	encryptaes
 
-#536. 4 ncsl lines
-	1,cipheraes.c:57,61
+#557. 4 ncsl lines
+	1,cipheraes.c:47,51
 	2,cipherblowfish.c:43,47
 	1 parameters
- 	1. decryptaes,	encryptblowfish
+ 	1. encryptaes,	encryptblowfish
 
-#537. 4 ncsl lines
+#558. 4 ncsl lines
 	0,cipher3des.c:29,33
-	1,cipheraes.c:47,51
+	1,cipheraes.c:57,61
 	1 parameters
- 	1. encrypt3des,	encryptaes
+ 	1. encrypt3des,	decryptaes
 
-#538. 4 ncsl lines
-	1,cipheraes.c:47,51
+#559. 4 ncsl lines
+	1,cipheraes.c:57,61
 	2,cipherblowfish.c:43,47
 	1 parameters
- 	1. encryptaes,	encryptblowfish
+ 	1. decryptaes,	encryptblowfish
 
-#539. 4 ncsl lines
+#560. 4 ncsl lines
 	0,cipher3des.c:35,39
-	3,cipherrc4.c:25,29
+	3,cipherrc4.c:31,35
 	1 parameters
- 	1. decrypt3des,	encryptrc4
+ 	1. decrypt3des,	decryptrc4
 
-#540. 4 ncsl lines
+#561. 4 ncsl lines
 	0,cipher3des.c:35,39
-	3,cipherrc4.c:31,35
+	3,cipherrc4.c:25,29
 	1 parameters
- 	1. decrypt3des,	decryptrc4
+ 	1. decrypt3des,	encryptrc4
+
+#562. 9 ncsl lines
+	6,dial.c:156,165
+	7,dial.thread.c:150,159
+	0 parameters
 
-#541. 3 ncsl lines
-	9,netssh.c:630,632
-	9,netssh.c:754,756
+#563. 10 ncsl lines
+	6,dial.c:285,301
+	12,ssh.c:114,125
 	0 parameters
 
-#542. 4 ncsl lines
-	9,netssh.c:645,648
-	9,netssh.c:688,691
+#564. 4 ncsl lines
+	12,ssh.c:30,38
+	12,ssh.c:171,175
 	1 parameters
- 	1. Qclone,	Qreqrem
+ 	1. shutdown,	starttunnel
 
-#543. 4 ncsl lines
-	9,netssh.c:645,648
-	9,netssh.c:707,710
+#565. 4 ncsl lines
+	12,ssh.c:80,84
+	12,ssh.c:171,175
 	1 parameters
- 	1. Qclone,	Qtcp
+ 	1. parseargs,	starttunnel
 
-#544. 4 ncsl lines
-	9,netssh.c:688,691
-	9,netssh.c:707,710
+#566. 4 ncsl lines
+	13,sshsession.c:398,402
+	13,sshsession.c:411,415
 	1 parameters
- 	1. Qreqrem,	Qtcp
+ 	1. get_string,	confine
 
-#545. 3 ncsl lines
-	9,netssh.c:645,647
-	9,netssh.c:719,721
-	0 parameters
+#567. 11 ncsl lines
+	9,netssh.c:2588,2601
+	9,netssh.c:2687,2699
+	1 parameters
+ 	1. validatekexs,	validatekexc
 
-#546. 3 ncsl lines
-	9,netssh.c:707,709
-	9,netssh.c:719,721
-	0 parameters
+#568. 10 ncsl lines
+	9,netssh.c:214,225
+	9,netssh.c:223,234
+	(overlap; region has 2 nonoverlapping matching 8-ncsl-line segments)
+	3 parameters
+ 	1. readio,	writeio
+ 	2. ioread,	iowrite
+ 	3. read,	write
 
-#547. 3 ncsl lines
-	9,netssh.c:378,380
-	9,netssh.c:688,690
+#569. 3 ncsl lines
+	9,netssh.c:383,385
+	9,netssh.c:724,726
 	0 parameters
 
-#548. 3 ncsl lines
-	9,netssh.c:378,380
-	9,netssh.c:719,721
+#570. 4 ncsl lines
+	9,netssh.c:650,653
+	9,netssh.c:712,715
+	1 parameters
+ 	1. Qclone,	Qtcp
+
+#571. 4 ncsl lines
+	9,netssh.c:650,653
+	9,netssh.c:693,696
+	1 parameters
+ 	1. Qclone,	Qreqrem
+
+#572. 4 ncsl lines
+	9,netssh.c:693,696
+	9,netssh.c:712,715
+	1 parameters
+ 	1. Qreqrem,	Qtcp
+
+#573. 3 ncsl lines
+	9,netssh.c:712,714
+	9,netssh.c:724,726
 	0 parameters
 
-#549. 3 ncsl lines
-	9,netssh.c:378,380
-	9,netssh.c:645,647
+#574. 3 ncsl lines
+	9,netssh.c:650,652
+	9,netssh.c:724,726
 	0 parameters
 
-#550. 4 ncsl lines
-	9,netssh.c:796,799
-	9,netssh.c:867,870
+#575. 3 ncsl lines
+	9,netssh.c:383,385
+	9,netssh.c:650,652
 	0 parameters
 
-#551. 3 ncsl lines
-	9,netssh.c:594,596
-	9,netssh.c:796,798
+#576. 3 ncsl lines
+	9,netssh.c:383,385
+	9,netssh.c:693,695
 	0 parameters
 
-#552. 4 ncsl lines
-	9,netssh.c:2424,2428
-	13,sshsession.c:146,150
+#577. 3 ncsl lines
+	9,netssh.c:635,637
+	9,netssh.c:759,761
 	0 parameters
 
-#553. 4 ncsl lines
-	9,netssh.c:2210,2214
+#578. 4 ncsl lines
+	9,netssh.c:2430,2434
 	13,sshsession.c:146,150
 	0 parameters
 
-#554. 4 ncsl lines
+#579. 4 ncsl lines
 	0,cipher3des.c:27,31
-	9,netssh.c:2210,2214
+	9,netssh.c:2430,2434
 	1 parameters
  	1. cs,	0
 
-#555. 4 ncsl lines
+#580. 4 ncsl lines
 	0,cipher3des.c:27,31
-	9,netssh.c:2424,2428
+	9,netssh.c:2216,2220
 	1 parameters
  	1. cs,	0
 
-#556. 4 ncsl lines
+#581. 4 ncsl lines
+	9,netssh.c:2216,2220
+	13,sshsession.c:146,150
+	0 parameters
+
+#582. 4 ncsl lines
 	6,dial.c:522,529
-	9,netssh.c:2210,2214
+	9,netssh.c:2216,2220
 	1 parameters
  	1. sl,	0
 
-#557. 4 ncsl lines
+#583. 4 ncsl lines
 	7,dial.thread.c:516,523
-	9,netssh.c:2210,2214
+	9,netssh.c:2216,2220
 	1 parameters
  	1. sl,	0
 
-#558. 4 ncsl lines
+#584. 4 ncsl lines
 	6,dial.c:522,529
-	9,netssh.c:2424,2428
+	9,netssh.c:2430,2434
 	1 parameters
  	1. sl,	0
 
-#559. 4 ncsl lines
+#585. 4 ncsl lines
 	7,dial.thread.c:516,523
-	9,netssh.c:2424,2428
+	9,netssh.c:2430,2434
 	1 parameters
  	1. sl,	0
 
-#560. 7 ncsl lines
-	5,dh.c:90,96
-	5,dh.c:157,163
-	0 parameters
-
-#561. 16 ncsl lines
-	6,dial.c:14,44
-	7,dial.thread.c:24,49
-	1 parameters
- 	1. pid,	cfd
-
-#562. 6 ncsl lines
-	9,netssh.c:721,726
-	9,netssh.c:968,973
-	0 parameters
-
-#563. 3 ncsl lines
-	12,ssh.c:496,498
-	13,sshsession.c:215,217
+#586. 4 ncsl lines
+	9,netssh.c:801,804
+	9,netssh.c:872,875
 	0 parameters
 
-#564. 3 ncsl lines
-	9,netssh.c:190,192
-	12,ssh.c:496,498
+#587. 3 ncsl lines
+	9,netssh.c:599,601
+	9,netssh.c:801,803
 	0 parameters
 
-#565. 5 ncsl lines
-	9,netssh.c:2359,2363
-	9,netssh.c:2368,2372
-	1 parameters
- 	1. SSH_MSG_CHANNEL_EOF,	SSH_MSG_CHANNEL_CLOSE
-
-#566. 4 ncsl lines
-	9,netssh.c:2311,2314
-	9,netssh.c:2368,2371
-	1 parameters
- 	1. SSH_MSG_CHANNEL_OPEN_CONFIRMATION,	SSH_MSG_CHANNEL_CLOSE
-
-#567. 4 ncsl lines
-	9,netssh.c:2320,2323
-	9,netssh.c:2368,2371
-	1 parameters
- 	1. SSH_MSG_CHANNEL_OPEN_FAILURE,	SSH_MSG_CHANNEL_CLOSE
-
-#568. 4 ncsl lines
-	9,netssh.c:2311,2314
-	9,netssh.c:2359,2362
-	1 parameters
- 	1. SSH_MSG_CHANNEL_OPEN_CONFIRMATION,	SSH_MSG_CHANNEL_EOF
-
-#569. 4 ncsl lines
-	9,netssh.c:2320,2323
-	9,netssh.c:2359,2362
-	1 parameters
- 	1. SSH_MSG_CHANNEL_OPEN_FAILURE,	SSH_MSG_CHANNEL_EOF
-
-#570. 4 ncsl lines
-	9,netssh.c:2311,2314
-	9,netssh.c:2397,2400
-	1 parameters
- 	1. SSH_MSG_CHANNEL_OPEN_CONFIRMATION,	SSH_MSG_CHANNEL_REQUEST
-
-#571. 4 ncsl lines
-	9,netssh.c:2320,2323
-	9,netssh.c:2397,2400
-	1 parameters
- 	1. SSH_MSG_CHANNEL_OPEN_FAILURE,	SSH_MSG_CHANNEL_REQUEST
-
-#572. 4 ncsl lines
-	9,netssh.c:2368,2371
-	9,netssh.c:2397,2400
+#588. 5 ncsl lines
+	9,netssh.c:631,635
+	9,netssh.c:653,657
 	1 parameters
- 	1. SSH_MSG_CHANNEL_CLOSE,	SSH_MSG_CHANNEL_REQUEST
+ 	1. Qlisten,	Qclone
 
-#573. 4 ncsl lines
-	9,netssh.c:690,693
-	9,netssh.c:965,968
+#589. 4 ncsl lines
+	9,netssh.c:176,179
+	13,sshsession.c:191,194
 	1 parameters
- 	1. readreqrem,	writereqremproc
-
-#574. 3 ncsl lines
-	9,netssh.c:380,382
-	9,netssh.c:794,796
-	0 parameters
-
-#575. 3 ncsl lines
-	9,netssh.c:724,726
-	9,netssh.c:794,796
-	0 parameters
-
-#576. 3 ncsl lines
-	9,netssh.c:794,796
-	9,netssh.c:971,973
-	0 parameters
-
-#577. 3 ncsl lines
-	9,netssh.c:794,796
-	9,netssh.c:961,963
-	0 parameters
-
-#578. 3 ncsl lines
-	9,netssh.c:794,796
-	12,ssh.c:218,220
-	0 parameters
-
-#579. 3 ncsl lines
-	9,netssh.c:794,796
-	9,netssh.c:1701,1703
-	0 parameters
-
-#580. 3 ncsl lines
-	9,netssh.c:666,668
-	9,netssh.c:794,796
-	0 parameters
+ 	1. 'k',	'i'
 
-#581. 4 ncsl lines
-	9,netssh.c:870,873
-	12,ssh.c:369,373
+#590. 4 ncsl lines
+	12,ssh.c:500,503
+	13,sshsession.c:191,194
 	1 parameters
- 	1. threadexits,	bail
+ 	1. 'I',	'i'
 
-#582. 5 ncsl lines
-	9,netssh.c:2209,2214
-	9,netssh.c:2423,2428
+#591. 3 ncsl lines
+	9,netssh.c:1210,1212
+	9,netssh.c:1484,1487
 	0 parameters
 
-#583. 30 ncsl lines
-	6,dial.c:364,408
-	7,dial.thread.c:367,411
-	1 parameters
- 	1. rv,	dfd
-
-#584. 4 ncsl lines
-	5,dh.c:574,578
-	5,dh.c:616,620
-	1 parameters
- 	1. p,	r
-
-#585. 6 ncsl lines
-	9,netssh.c:608,613
-	9,netssh.c:934,939
+#592. 6 ncsl lines
+	9,netssh.c:613,618
+	9,netssh.c:939,944
 	1 parameters
  	1. "stread",	"stwrite"
 
-#586. 5 ncsl lines
-	9,netssh.c:2629,2634
-	9,netssh.c:2721,2725
-	0 parameters
-
-#587. 5 ncsl lines
-	9,netssh.c:2616,2621
-	9,netssh.c:2710,2715
-	0 parameters
-
-#588. 5 ncsl lines
-	9,netssh.c:2642,2647
-	9,netssh.c:2731,2736
-	0 parameters
-
-#589. 5 ncsl lines
-	9,netssh.c:2655,2660
-	9,netssh.c:2742,2747
-	0 parameters
-
-#590. 5 ncsl lines
-	9,netssh.c:2603,2608
-	9,netssh.c:2699,2704
-	0 parameters
-
-#591. 9 ncsl lines
-	9,netssh.c:2668,2677
-	9,netssh.c:2753,2762
-	0 parameters
-
-#592. 3 ncsl lines
-	9,netssh.c:1814,1817
-	9,netssh.c:1978,1981
-	0 parameters
-
-#593. 8 ncsl lines
-	9,netssh.c:1076,1084
-	9,netssh.c:1266,1273
+#593. 6 ncsl lines
+	9,netssh.c:410,416
+	9,netssh.c:1378,1383
 	2 parameters
- 	1. "writectlproc",	"writereqremproc"
- 	2. "bad connection",	"Invalid connection"
-
-#594. 7 ncsl lines
-	9,netssh.c:739,745
-	9,netssh.c:1266,1272
-	1 parameters
- 	1. "readreqrem",	"writereqremproc"
+ 	1. "stlisconn",	"writedataproc"
+ 	2. cl,	c
 
-#595. 6 ncsl lines
-	9,netssh.c:405,411
-	9,netssh.c:1372,1377
+#594. 6 ncsl lines
+	9,netssh.c:410,416
+	9,netssh.c:495,500
 	2 parameters
- 	1. "stlisconn",	"writedataproc"
+ 	1. "stlisconn",	"stlischan"
  	2. cl,	c
 
-#596. 6 ncsl lines
-	9,netssh.c:405,411
-	9,netssh.c:884,889
+#595. 6 ncsl lines
+	9,netssh.c:410,416
+	9,netssh.c:889,894
 	2 parameters
  	1. "stlisconn",	"readdata"
  	2. cl,	c
 
-#597. 6 ncsl lines
-	9,netssh.c:405,411
-	9,netssh.c:490,495
+#596. 8 ncsl lines
+	9,netssh.c:1081,1089
+	9,netssh.c:1271,1278
 	2 parameters
- 	1. "stlisconn",	"stlischan"
- 	2. cl,	c
+ 	1. "writectlproc",	"writereqremproc"
+ 	2. "bad connection",	"Invalid connection"
+
+#597. 7 ncsl lines
+	9,netssh.c:744,750
+	9,netssh.c:1271,1277
+	1 parameters
+ 	1. "readreqrem",	"writereqremproc"
+
+#598. 3 ncsl lines
+	9,netssh.c:1820,1823
+	9,netssh.c:1984,1987
+	0 parameters
 
-#598. 6 ncsl lines
+#599. 6 ncsl lines
 	9,netssh.c:122,128
 	9,netssh.c:138,144
 	2 parameters
  	1. id,	p
  	2. sshlog,	sshdebug
 
-#599. 5 ncsl lines
-	9,netssh.c:312,317
-	9,netssh.c:923,928
-	1 parameters
- 	1. stopen,	stwrite
-
 #600. 5 ncsl lines
-	9,netssh.c:391,396
-	9,netssh.c:872,877
+	9,netssh.c:396,401
+	9,netssh.c:877,882
 	1 parameters
  	1. stlisconn,	readdata
 
-#601. 3 ncsl lines
-	9,netssh.c:872,875
-	9,netssh.c:923,926
-	0 parameters
+#601. 5 ncsl lines
+	9,netssh.c:317,322
+	9,netssh.c:928,933
+	1 parameters
+ 	1. stopen,	stwrite
 
 #602. 3 ncsl lines
-	9,netssh.c:312,315
-	9,netssh.c:872,875
+	9,netssh.c:877,880
+	9,netssh.c:928,931
 	0 parameters
 
 #603. 3 ncsl lines
-	9,netssh.c:551,554
-	9,netssh.c:872,875
+	9,netssh.c:317,320
+	9,netssh.c:877,880
 	0 parameters
 
 #604. 3 ncsl lines
-	9,netssh.c:476,479
-	9,netssh.c:551,554
+	9,netssh.c:556,559
+	9,netssh.c:877,880
 	0 parameters
 
 #605. 3 ncsl lines
-	9,netssh.c:551,554
-	9,netssh.c:1252,1255
+	9,netssh.c:556,559
+	9,netssh.c:928,931
 	0 parameters
 
 #606. 3 ncsl lines
-	9,netssh.c:391,394
-	9,netssh.c:551,554
+	9,netssh.c:317,320
+	9,netssh.c:556,559
 	0 parameters
 
 #607. 3 ncsl lines
-	9,netssh.c:551,554
-	9,netssh.c:923,926
+	9,netssh.c:556,559
+	9,netssh.c:1257,1260
 	0 parameters
 
 #608. 3 ncsl lines
-	9,netssh.c:312,315
-	9,netssh.c:551,554
+	9,netssh.c:481,484
+	9,netssh.c:556,559
+	0 parameters
+
+#609. 3 ncsl lines
+	9,netssh.c:396,399
+	9,netssh.c:556,559
 	0 parameters
 
-#609. 4 ncsl lines
-	9,netssh.c:311,315
-	9,netssh.c:1251,1255
+#610. 4 ncsl lines
+	9,netssh.c:316,320
+	9,netssh.c:1256,1260
 	1 parameters
  	1. freeme,	buf
 
-#610. 3 ncsl lines
-	9,netssh.c:1047,1049
-	9,netssh.c:1251,1253
-	0 parameters
-
 #611. 3 ncsl lines
-	9,netssh.c:2148,2150
-	9,netssh.c:2431,2433
+	9,netssh.c:1052,1054
+	9,netssh.c:1256,1258
 	0 parameters
 
 #612. 3 ncsl lines
-	9,netssh.c:1145,1147
-	9,netssh.c:1492,1494
+	9,netssh.c:2154,2156
+	9,netssh.c:2437,2439
+	0 parameters
+
+#613. 4 ncsl lines
+	5,dh.c:574,578
+	5,dh.c:616,620
+	1 parameters
+ 	1. p,	r
+
+#614. 30 ncsl lines
+	6,dial.c:364,408
+	7,dial.thread.c:367,411
+	1 parameters
+ 	1. rv,	dfd
+
+#615. 9 ncsl lines
+	9,netssh.c:2674,2683
+	9,netssh.c:2759,2768
 	0 parameters
 
-#613. 3 ncsl lines
-	9,netssh.c:1145,1147
-	9,netssh.c:1446,1448
+#616. 5 ncsl lines
+	9,netssh.c:2609,2614
+	9,netssh.c:2705,2710
 	0 parameters
 
-#614. 3 ncsl lines
-	9,netssh.c:1145,1147
-	9,netssh.c:1236,1238
+#617. 5 ncsl lines
+	9,netssh.c:2635,2640
+	9,netssh.c:2727,2731
 	0 parameters
 
-#615. 3 ncsl lines
-	9,netssh.c:1145,1147
-	9,netssh.c:1186,1188
+#618. 5 ncsl lines
+	9,netssh.c:2622,2627
+	9,netssh.c:2716,2721
 	0 parameters
 
-#616. 5 ncsl lines
+#619. 5 ncsl lines
+	9,netssh.c:2661,2666
+	9,netssh.c:2748,2753
+	0 parameters
+
+#620. 5 ncsl lines
+	9,netssh.c:2648,2653
+	9,netssh.c:2737,2742
+	0 parameters
+
+#621. 5 ncsl lines
 	12,ssh.c:71,75
-	12,ssh.c:388,392
+	12,ssh.c:411,415
 	1 parameters
  	1. fd,	nfd
 
--- /sys/src/cmd/ssh2/dup.pro	Thu Apr 19 15:20:26 2012
+++ /sys/src/cmd/ssh2/dup.pro	Mon Apr 23 09:10:17 2012
@@ -3,2636 +3,2655 @@
 where i_k is 1 for first interval of match_k and 2 for the second
 
 0,cipher3des.c:1,6, # distinct matches = 6:
-	117.1, 134.1, 125.1, 120.1, 129.1, 119.1
+	135.1, 132.1, 144.1, 130.1, 145.1, 140.1
 
 0,cipher3des.c:7,7, # distinct matches = 5:
-	117.1, 125.1, 120.1, 129.1, 119.1
+	135.1, 132.1, 144.1, 130.1, 140.1
 
 0,cipher3des.c:8,9, # distinct matches = 3:
-	117.1, 120.1, 119.1
+	135.1, 132.1, 130.1
 
 0,cipher3des.c:10,14, # distinct matches = 3:
-	313.1, 117.1, 119.1
+	346.1, 132.1, 130.1
 
 0,cipher3des.c:15,16, # distinct matches = 2:
-	117.1, 119.1
+	132.1, 130.1
 
 0,cipher3des.c:17,17, # distinct matches = 1:
-	117.1
+	130.1
 
 
 0,cipher3des.c:27,27, # distinct matches = 5:
-	555.1, 344.1, 347.1, 348.1, 554.1
+	379.1, 579.1, 380.1, 378.1, 580.1
 
 0,cipher3des.c:28,28, # distinct matches = 7:
-	89.1, 88.1, 555.1, 344.1, 347.1, 348.1, 554.1
+	78.1, 79.1, 379.1, 579.1, 380.1, 378.1, 580.1
 
 0,cipher3des.c:29,31, # distinct matches = 12:
-	531.1, 533.1, 535.1, 537.1, 529.1, 89.1, 88.1, 555.1, 344.1, 347.1, 348.1, 554.1
+	558.1, 550.1, 554.1, 552.1, 556.1, 78.1, 79.1, 379.1, 579.1, 380.1, 378.1, 580.1
 
 0,cipher3des.c:32,33, # distinct matches = 7:
-	531.1, 533.1, 535.1, 537.1, 529.1, 89.1, 88.1
+	558.1, 550.1, 554.1, 552.1, 556.1, 78.1, 79.1
 
 0,cipher3des.c:34,34, # distinct matches = 2:
-	529.1, 88.1
+	550.1, 78.1
 
 0,cipher3des.c:35,35, # distinct matches = 8:
-	539.1, 529.2, 540.1, 340.1, 530.1, 341.1, 529.1, 88.1
+	550.2, 560.1, 551.1, 561.1, 370.1, 369.1, 550.1, 78.1
 
 0,cipher3des.c:36,39, # distinct matches = 7:
-	539.1, 529.2, 540.1, 340.1, 530.1, 341.1, 88.1
+	550.2, 560.1, 551.1, 561.1, 370.1, 369.1, 78.1
 
 0,cipher3des.c:40,41, # distinct matches = 2:
-	529.2, 530.1
+	550.2, 551.1
 
 
 1,cipheraes.c:1,6, # distinct matches = 6:
-	128.1, 124.1, 122.1, 135.1, 121.1, 120.2
+	133.1, 134.1, 148.1, 141.1, 135.2, 137.1
 
 1,cipheraes.c:7,7, # distinct matches = 5:
-	128.1, 124.1, 122.1, 121.1, 120.2
+	133.1, 134.1, 141.1, 135.2, 137.1
 
 1,cipheraes.c:8,8, # distinct matches = 3:
-	122.1, 121.1, 120.2
+	133.1, 134.1, 135.2
 
 
 1,cipheraes.c:12,16, # distinct matches = 3:
-	314.1, 313.2, 312.1
+	347.1, 345.1, 346.2
 
 
 1,cipheraes.c:29,34, # distinct matches = 2:
-	328.1, 327.1
+	359.1, 360.1
 
 1,cipheraes.c:35,35, # distinct matches = 3:
-	327.2, 328.1, 327.1
+	359.2, 359.1, 360.1
 
 1,cipheraes.c:36,40, # distinct matches = 2:
-	327.2, 327.1
+	359.2, 359.1
 
 1,cipheraes.c:41,41, # distinct matches = 3:
-	328.2, 327.2, 327.1
+	360.2, 359.2, 359.1
 
 1,cipheraes.c:42,46, # distinct matches = 2:
-	328.2, 327.2
+	360.2, 359.2
 
 1,cipheraes.c:47,47, # distinct matches = 9:
-	537.2, 538.1, 524.1, 526.1, 339.1, 522.1, 341.2, 241.1, 328.2, 327.2
+	546.1, 556.2, 372.1, 279.1, 370.2, 544.1, 543.1, 557.1, 360.2, 359.2
 
 1,cipheraes.c:48,51, # distinct matches = 7:
-	537.2, 538.1, 524.1, 526.1, 339.1, 522.1, 341.2, 241.1
+	546.1, 556.2, 372.1, 279.1, 370.2, 544.1, 543.1, 557.1
 
 1,cipheraes.c:52,53, # distinct matches = 1:
-	522.1, 241.1
+	279.1, 543.1
 
+1,cipheraes.c:54,56, # distinct matches = 1:
+	543.1
 
-1,cipheraes.c:57,57, # distinct matches = 7:
-	338.1, 522.2 (coincides with 241.2), 523.1, 525.1, 535.2, 536.1, 241.2, 340.2, 522.1
+1,cipheraes.c:57,57, # distinct matches = 8:
+	545.1, 559.1, 369.2, 558.2, 371.1, 547.1, 279.2 (coincides with 543.2), 543.2, 543.1
 
 1,cipheraes.c:58,61, # distinct matches = 7:
-	338.1, 522.2 (coincides with 241.2), 523.1, 525.1, 535.2, 536.1, 241.2, 340.2
+	545.1, 559.1, 369.2, 558.2, 371.1, 547.1, 279.2 (coincides with 543.2), 543.2
 
 1,cipheraes.c:62,63, # distinct matches = 1:
-	522.2 (coincides with 241.2), 241.2
+	279.2 (coincides with 543.2), 543.2
 
+1,cipheraes.c:64,68, # distinct matches = 1:
+	543.2
 
 1,cipheraes.c:69,76, # distinct matches = 1:
-	143.1
+	159.1
 
 1,cipheraes.c:77,83, # distinct matches = 2:
-	143.2, 143.1
+	159.2, 159.1
 
 1,cipheraes.c:84,91, # distinct matches = 1:
-	143.2
+	159.2
 
 2,cipherblowfish.c:1,6, # distinct matches = 6:
-	119.2, 118.1, 131.1, 127.1, 122.2, 132.1
+	133.2, 142.1, 138.1, 131.1, 147.1, 132.2
 
 2,cipherblowfish.c:7,7, # distinct matches = 5:
-	119.2, 118.1, 131.1, 127.1, 122.2
+	133.2, 142.1, 138.1, 131.1, 132.2
 
 2,cipherblowfish.c:8,9, # distinct matches = 3:
-	119.2, 118.1, 122.2
+	133.2, 131.1, 132.2
 
 2,cipherblowfish.c:10,14, # distinct matches = 3:
-	312.2, 119.2, 118.1
+	347.2, 131.1, 132.2
 
 2,cipherblowfish.c:15,16, # distinct matches = 2:
-	119.2, 118.1
+	131.1, 132.2
 
 
 2,cipherblowfish.c:42,42, # distinct matches = 2:
-	168.1, 88.2
+	202.1, 78.2
 
 2,cipherblowfish.c:43,47, # distinct matches = 7:
-	538.2, 536.2, 534.1, 532.1, 530.2, 168.1, 88.2
+	553.1, 555.1, 557.2, 551.2, 559.2, 202.1, 78.2
 
 2,cipherblowfish.c:48,48, # distinct matches = 2:
-	530.2, 88.2
+	551.2, 78.2
 
 2,cipherblowfish.c:49,49, # distinct matches = 8:
-	528.1, 527.1, 533.2, 339.2, 534.2, 338.2, 530.2, 88.2
+	549.1, 372.2, 554.2, 555.2, 371.2, 548.1, 551.2, 78.2
 
 2,cipherblowfish.c:50,53, # distinct matches = 7:
-	528.1, 527.1, 533.2, 339.2, 534.2, 338.2, 88.2
+	549.1, 372.2, 554.2, 555.2, 371.2, 548.1, 78.2
 
 
 3,cipherrc4.c:1,6, # distinct matches = 6:
-	130.1, 121.2, 133.1, 126.1, 117.2, 118.2
+	131.2, 139.1, 130.2, 146.1, 134.2, 143.1
 
 3,cipherrc4.c:7,7, # distinct matches = 5:
-	130.1, 121.2, 126.1, 117.2, 118.2
+	131.2, 139.1, 130.2, 134.2, 143.1
 
 3,cipherrc4.c:8,9, # distinct matches = 3:
-	121.2, 117.2, 118.2
+	131.2, 130.2, 134.2
 
 3,cipherrc4.c:10,14, # distinct matches = 3:
-	314.2, 117.2, 118.2
+	345.2, 131.2, 130.2
 
 3,cipherrc4.c:15,16, # distinct matches = 2:
-	117.2, 118.2
+	131.2, 130.2
 
 3,cipherrc4.c:17,17, # distinct matches = 1:
-	117.2
+	130.2
 
 
 3,cipherrc4.c:24,24, # distinct matches = 2:
-	168.2, 89.2
+	202.2, 79.2
 
 3,cipherrc4.c:25,29, # distinct matches = 7:
-	523.2, 539.2, 521.1, 524.2, 528.2, 168.2, 89.2
+	561.2, 548.2, 547.2, 542.1, 546.2, 202.2, 79.2
 
 3,cipherrc4.c:30,30, # distinct matches = 1:
-	521.1
+	542.1
 
 3,cipherrc4.c:31,31, # distinct matches = 8:
-	540.2, 525.2, 526.2, 531.2, 521.2, 527.2, 532.2, 521.1
+	542.2, 552.2, 549.2, 560.2, 545.2, 544.2, 553.2, 542.1
 
 3,cipherrc4.c:32,35, # distinct matches = 7:
-	540.2, 525.2, 526.2, 531.2, 521.2, 527.2, 532.2
+	542.2, 552.2, 549.2, 560.2, 545.2, 544.2, 553.2
 
 3,cipherrc4.c:36,37, # distinct matches = 1:
-	521.2
+	542.2
 
 
 5,dh.c:19,24, # distinct matches = 1:
-	435.1
+	486.1
 
 
 5,dh.c:30,35, # distinct matches = 1:
-	435.2
+	486.2
 
 
 5,dh.c:71,79, # distinct matches = 1:
-	163.1
+	199.1
 
 
 5,dh.c:81,88, # distinct matches = 1:
-	61.1
+	73.1
 
 
 5,dh.c:90,96, # distinct matches = 1:
-	560.1
+	503.1
 
 5,dh.c:97,97, # distinct matches = 1:
-	142.1
+	169.1
 
 5,dh.c:98,98, # distinct matches = 2:
-	436.1, 142.1
+	487.1, 169.1
 
 5,dh.c:99,99, # distinct matches = 4:
-	56.1, 400.1, 323.1, 436.1, 142.1
+	49.1, 435.1, 186.1, 487.1, 169.1
 
 5,dh.c:100,102, # distinct matches = 5:
-	197.1, 56.1, 400.1, 323.1, 436.1, 142.1
+	230.1, 49.1, 435.1, 186.1, 487.1, 169.1
 
 
 5,dh.c:106,106, # distinct matches = 1:
-	142.2
+	169.2
 
 5,dh.c:107,107, # distinct matches = 5:
-	438.1, 439.1, 440.1, 437.1, 142.2
+	489.1, 490.1, 488.1, 491.1, 169.2
 
 5,dh.c:108,108, # distinct matches = 7:
-	319.1, 59.1, 438.1, 439.1, 440.1, 437.1, 142.2
+	52.1, 182.1, 489.1, 490.1, 488.1, 491.1, 169.2
 
 5,dh.c:109,111, # distinct matches = 8:
-	191.1, 319.1, 59.1, 438.1, 439.1, 440.1, 437.1, 142.2
+	224.1, 52.1, 182.1, 489.1, 490.1, 488.1, 491.1, 169.2
 
 
 5,dh.c:122,124, # distinct matches = 8:
-	193.1, 194.1, 195.1, 196.1, 197.2, 198.1, 191.2, 192.1
+	231.1, 225.1, 226.1, 227.1, 230.2, 229.1, 224.2, 228.1
 
 
 5,dh.c:137,145, # distinct matches = 1:
-	163.2
+	199.2
 
 
 5,dh.c:147,153, # distinct matches = 1:
-	61.2
+	73.2
 
 5,dh.c:154,154, # distinct matches = 8:
-	59.2, 53.1, 57.1, 56.2, 55.1, 54.1, 58.1, 61.2
+	52.2, 46.1, 47.1, 50.1, 49.2, 48.1, 51.1, 73.2
 
 5,dh.c:155,156, # distinct matches = 8:
-	193.2, 59.2, 53.1, 57.1, 56.2, 55.1, 54.1, 58.1
+	226.2, 52.2, 46.1, 47.1, 50.1, 49.2, 48.1, 51.1
 
 5,dh.c:157,157, # distinct matches = 9:
-	560.2, 193.2, 59.2, 53.1, 57.1, 56.2, 55.1, 54.1, 58.1
+	503.2, 226.2, 52.2, 46.1, 47.1, 50.1, 49.2, 48.1, 51.1
 
 5,dh.c:158,163, # distinct matches = 1:
-	560.2
+	503.2
 
 5,dh.c:164,164, # distinct matches = 3:
-	139.1, 141.1, 140.1
+	166.1, 167.1, 168.1
 
 5,dh.c:165,165, # distinct matches = 5:
-	436.2, 440.2, 139.1, 141.1, 140.1
+	491.2, 487.2, 166.1, 167.1, 168.1
 
 5,dh.c:166,166, # distinct matches = 7:
-	400.2, 57.2, 324.1, 397.1, 398.1, 399.1, 436.2 (coincides with 400.2), 440.2, 139.1, 141.1, 140.1
+	435.2, 50.2, 436.1, 433.1, 434.1, 187.1, 491.2, 487.2 (coincides with 435.2), 166.1, 167.1, 168.1
 
 5,dh.c:167,169, # distinct matches = 8:
-	198.2, 400.2, 57.2, 324.1, 397.1, 398.1, 399.1, 436.2 (coincides with 400.2), 440.2, 139.1, 141.1, 140.1
+	231.2, 435.2, 50.2, 436.1, 433.1, 434.1, 187.1, 491.2, 487.2 (coincides with 435.2), 166.1, 167.1, 168.1
 
 
 5,dh.c:171,171, # distinct matches = 3:
-	172.1, 140.2, 171.1
+	205.1, 204.1, 168.2
 
 5,dh.c:172,172, # distinct matches = 4:
-	439.2, 172.1, 140.2, 171.1
+	490.2, 205.1, 204.1, 168.2
 
 5,dh.c:173,173, # distinct matches = 6:
-	55.2, 322.1, 399.2, 439.2, 172.1, 140.2 (coincides with 399.2), 171.1
+	48.2, 434.2, 185.1, 490.2, 205.1, 204.1, 168.2 (coincides with 434.2)
 
 5,dh.c:174,176, # distinct matches = 7:
-	196.2, 55.2, 322.1, 399.2, 439.2, 172.1, 140.2 (coincides with 399.2), 171.1
+	229.2, 48.2, 434.2, 185.1, 490.2, 205.1, 204.1, 168.2 (coincides with 434.2)
 
 
 5,dh.c:178,178, # distinct matches = 2:
-	171.2, 139.2
+	167.2, 205.2
 
 5,dh.c:179,179, # distinct matches = 3:
-	438.2, 171.2, 139.2
+	489.2, 167.2, 205.2
 
 5,dh.c:180,180, # distinct matches = 5:
-	321.1, 54.2, 398.2, 438.2, 171.2, 139.2 (coincides with 398.2)
+	433.2, 184.1, 47.2, 489.2, 167.2 (coincides with 433.2), 205.2
 
 5,dh.c:181,183, # distinct matches = 6:
-	195.2, 321.1, 54.2, 398.2, 438.2, 171.2, 139.2 (coincides with 398.2)
+	228.2, 433.2, 184.1, 47.2, 489.2, 167.2 (coincides with 433.2), 205.2
 
 
 5,dh.c:185,185, # distinct matches = 2:
-	141.2, 172.2
+	204.2, 166.2
 
 5,dh.c:186,186, # distinct matches = 3:
-	437.2, 141.2, 172.2
+	488.2, 204.2, 166.2
 
 5,dh.c:187,187, # distinct matches = 5:
-	53.2, 320.1, 397.2, 437.2, 141.2 (coincides with 397.2), 172.2
+	183.1, 436.2, 46.2, 488.2, 204.2, 166.2 (coincides with 436.2)
 
 5,dh.c:188,190, # distinct matches = 6:
-	194.2, 53.2, 320.1, 397.2, 437.2, 141.2 (coincides with 397.2), 172.2
+	227.2, 183.1, 436.2, 46.2, 488.2, 204.2, 166.2 (coincides with 436.2)
 
 
 5,dh.c:198,198, # distinct matches = 7:
-	323.2, 320.2, 319.2, 58.2, 321.2, 322.2, 324.2
+	51.2, 182.2, 183.2, 184.2, 187.2, 185.2, 186.2
 
 5,dh.c:199,201, # distinct matches = 8:
-	192.2, 323.2, 320.2, 319.2, 58.2, 321.2, 322.2, 324.2
+	225.2, 51.2, 182.2, 183.2, 184.2, 187.2, 185.2, 186.2
 
 
 5,dh.c:204,209, # distinct matches = 1:
-	330.1
+	358.1
 
 
 5,dh.c:243,248, # distinct matches = 1:
-	329.1
+	361.1
 
 
 5,dh.c:259,263, # distinct matches = 1:
-	30.1
+	70.1
 
 
 5,dh.c:280,282, # distinct matches = 1:
-	293.1, 52.1
+	45.1, 314.1
 
 5,dh.c:283,284, # distinct matches = 1:
-	52.1
+	45.1
 
 
 5,dh.c:289,291, # distinct matches = 1:
-	199.1
+	234.1
 
 
 5,dh.c:296,304, # distinct matches = 1:
-	309.1
+	342.1
 
 
 5,dh.c:320,324, # distinct matches = 1:
-	30.2
+	70.2
 
 
 5,dh.c:371,376, # distinct matches = 1:
-	330.2
+	358.2
 
 
 5,dh.c:387,392, # distinct matches = 1:
-	329.2
+	361.2
 
 
 5,dh.c:418,420, # distinct matches = 1:
-	52.2, 293.2 (coincides with 52.2)
+	314.2 (coincides with 45.2), 45.2
 
 5,dh.c:421,422, # distinct matches = 1:
-	52.2
+	45.2
 
 
 5,dh.c:424,426, # distinct matches = 1:
-	199.2
+	234.2
 
 
 5,dh.c:428,431, # distinct matches = 1:
-	309.2
+	342.2
 
 
 5,dh.c:436,439, # distinct matches = 5:
-	219.1, 303.1, 419.1, 167.1, 306.1
+	251.1, 475.1, 337.1, 201.1, 339.1
 
 
 5,dh.c:487,492, # distinct matches = 1:
-	325.1
+	404.1
 
 
 5,dh.c:502,505, # distinct matches = 1:
-	403.1
+	457.1
 
 5,dh.c:506,509, # distinct matches = 1:
-	469.1
+	177.1
 
 
 5,dh.c:549,549, # distinct matches = 1:
-	470.1
+	178.1
 
 5,dh.c:550,553, # distinct matches = 2:
-	421.1, 470.1
+	471.1, 178.1
 
 5,dh.c:554,556, # distinct matches = 1:
-	421.1
+	471.1
 
 
 5,dh.c:572,573, # distinct matches = 5:
-	369.1, 374.1, 373.1, 368.1, 375.1
+	469.1, 467.1, 466.1, 465.1, 468.1
 
 5,dh.c:574,574, # distinct matches = 6:
-	584.1, 369.1, 374.1, 373.1, 368.1, 375.1
+	613.1, 469.1, 467.1, 466.1, 465.1, 468.1
 
 5,dh.c:575,578, # distinct matches = 4:
-	304.1, 418.1, 305.1, 584.1
+	476.1, 336.1, 335.1, 613.1
 
 
 5,dh.c:616,616, # distinct matches = 1:
-	584.2
+	613.2
 
 5,dh.c:617,620, # distinct matches = 5:
-	303.2, 301.1, 300.1, 422.1, 584.2
+	473.1, 334.1, 333.1, 337.2, 613.2
 
 
 5,dh.c:707,712, # distinct matches = 1:
-	325.2
+	404.2
 
 
 5,dh.c:718,720, # distinct matches = 1:
-	403.2
+	457.2
 
 
 5,dh.c:723,726, # distinct matches = 1:
-	469.2
+	177.2
 
 
 5,dh.c:767,773, # distinct matches = 1:
-	421.2
+	471.2
 
 
 5,dh.c:784,786, # distinct matches = 4:
-	378.1, 375.2, 377.1, 376.1
+	464.1, 462.1, 468.2, 463.1
 
 
 5,dh.c:789,792, # distinct matches = 4:
-	420.1, 308.1, 307.1, 306.2
+	341.1, 339.2, 474.1, 340.1
 
 
 5,dh.c:795,798, # distinct matches = 6:
-	82.1, 81.1, 83.1, 84.1, 80.1, 79.1
+	90.1, 80.1, 86.1, 84.1, 85.1, 83.1
 
 
 5,dh.c:826,834, # distinct matches = 5:
-	115.1, 114.1, 113.1, 112.1, 116.1
+	158.1, 156.1, 155.1, 154.1, 157.1
 
 5,dh.c:835,843, # distinct matches = 5:
-	112.2, 115.1, 114.1, 113.1, 112.1
+	154.2, 156.1, 155.1, 154.1, 157.1
 
 5,dh.c:844,852, # distinct matches = 5:
-	113.2, 112.2, 114.1, 113.1, 112.1
+	155.2, 154.2, 156.1, 155.1, 154.1
 
 5,dh.c:853,861, # distinct matches = 5:
-	114.2, 113.2, 112.2, 113.1, 112.1
+	156.2, 155.2, 154.2, 155.1, 154.1
 
 5,dh.c:862,870, # distinct matches = 5:
-	115.2, 114.2, 113.2, 112.2, 112.1
+	157.2, 156.2, 155.2, 154.2, 154.1
 
 5,dh.c:871,877, # distinct matches = 5:
-	116.2, 115.2, 114.2, 113.2, 112.2
+	158.2, 157.2, 156.2, 155.2, 154.2
 
 
 6,dial.c:4,6, # distinct matches = 1:
-	138.1
+	151.1
 
 
 6,dial.c:14,44, # distinct matches = 1:
-	561.1
+	2.1
 
 
 6,dial.c:61,65, # distinct matches = 1:
-	362.1
+	416.1
 
 
 6,dial.c:68,89, # distinct matches = 1:
-	257.1
+	303.1
 
 6,dial.c:90,93, # distinct matches = 3:
-	98.1, 100.1, 257.1
+	173.1, 171.1, 303.1
 
 6,dial.c:94,96, # distinct matches = 1:
-	257.1
+	303.1
 
 6,dial.c:97,99, # distinct matches = 2:
-	34.1, 257.1
+	69.1, 303.1
 
 6,dial.c:100,103, # distinct matches = 3:
-	99.1, 98.2, 257.1
+	173.2, 172.1, 303.1
 
 6,dial.c:104,124, # distinct matches = 1:
-	257.1
+	303.1
 
 
 6,dial.c:141,141, # distinct matches = 6:
-	220.1, 74.1, 87.1, 84.2, 76.1, 221.1
+	248.1, 247.1, 87.1, 89.1, 90.2, 88.1
 
 6,dial.c:142,144, # distinct matches = 8:
-	343.1, 342.1, 220.1, 74.1, 87.1, 84.2, 76.1, 221.1
+	374.1, 375.1, 248.1, 247.1, 87.1, 89.1, 90.2, 88.1
 
 6,dial.c:145,146, # distinct matches = 2:
-	343.1, 342.1
+	374.1, 375.1
 
 
 6,dial.c:156,163, # distinct matches = 1:
-	520.1
+	562.1
 
-6,dial.c:164,165, # distinct matches = 7:
-	487.1, 227.1, 229.1, 232.1, 497.1, 226.1, 520.1
+6,dial.c:164,165, # distinct matches = 8:
+	516.1, 266.1, 264.1, 265.1, 518.1, 263.1, 262.1, 562.1
 
-6,dial.c:166,167, # distinct matches = 6:
-	487.1, 227.1, 229.1, 232.1, 497.1, 226.1
+6,dial.c:166,167, # distinct matches = 7:
+	516.1, 266.1, 264.1, 265.1, 518.1, 263.1, 262.1
 
 
 6,dial.c:191,192, # distinct matches = 3:
-	478.1, 476.1, 479.1
+	507.1, 506.1, 508.1
 
 6,dial.c:193,195, # distinct matches = 5:
-	503.1, 504.1, 478.1, 476.1, 479.1
+	528.1, 529.1, 507.1, 506.1, 508.1
 
 6,dial.c:196,197, # distinct matches = 2:
-	503.1, 504.1
+	528.1, 529.1
 
 
 6,dial.c:202,202, # distinct matches = 1:
-	425.1
+	470.1
 
 6,dial.c:203,203, # distinct matches = 5:
-	418.2, 419.2, 420.2, 422.2, 425.1
+	476.2, 474.2, 473.2, 475.2, 470.1
 
 6,dial.c:204,204, # distinct matches = 7:
-	503.2, 332.1, 418.2, 419.2, 420.2, 422.2, 425.1
+	362.1, 528.2, 476.2, 474.2, 473.2, 475.2, 470.1
 
 6,dial.c:205,206, # distinct matches = 6:
-	503.2, 332.1, 418.2, 419.2, 420.2, 422.2
+	362.1, 528.2, 476.2, 474.2, 473.2, 475.2
 
 6,dial.c:207,208, # distinct matches = 2:
-	503.2, 332.1
+	362.1, 528.2
 
 
 6,dial.c:216,220, # distinct matches = 1:
-	333.1
+	363.1
 
 
 6,dial.c:226,229, # distinct matches = 1:
-	441.1
+	496.1
 
 
 6,dial.c:255,256, # distinct matches = 1:
-	502.1
+	540.1
 
 6,dial.c:257,259, # distinct matches = 2:
-	505.1, 502.1
+	530.1, 540.1
 
 6,dial.c:260,274, # distinct matches = 1:
-	505.1
+	530.1
 
 6,dial.c:275,278, # distinct matches = 6:
-	86.1, 83.2, 75.1, 73.1, 221.2, 505.1
+	74.1, 75.1, 86.2, 248.2, 82.1, 530.1
+
 
+6,dial.c:281,284, # distinct matches = 1:
+	25.1
+
+6,dial.c:285,285, # distinct matches = 2:
+	563.1, 25.1
 
-6,dial.c:281,285, # distinct matches = 1:
-	17.1
+6,dial.c:286,293, # distinct matches = 1:
+	563.1
 
+6,dial.c:294,301, # distinct matches = 2:
+	363.2, 563.1
 
-6,dial.c:294,303, # distinct matches = 1:
-	333.2
+6,dial.c:302,303, # distinct matches = 1:
+	363.2
 
 
 6,dial.c:331,331, # distinct matches = 2:
-	34.2, 33.1
+	68.1, 69.2
 
 6,dial.c:332,333, # distinct matches = 4:
-	217.1, 302.1, 34.2, 33.1
+	249.1, 338.1, 68.1, 69.2
 
 6,dial.c:334,335, # distinct matches = 2:
-	217.1, 302.1
+	249.1, 338.1
 
 6,dial.c:336,340, # distinct matches = 1:
-	217.1
+	249.1
 
 
 6,dial.c:342,346, # distinct matches = 1:
-	318.1
+	352.1
 
 
 6,dial.c:350,356, # distinct matches = 2:
-	355.1, 356.1
+	408.1, 409.1
 
 6,dial.c:357,361, # distinct matches = 1:
-	97.1
+	175.1
 
 
 6,dial.c:364,366, # distinct matches = 2:
-	200.1, 583.1
+	614.1, 223.1
 
 6,dial.c:367,373, # distinct matches = 1:
-	583.1
+	614.1
 
 6,dial.c:374,376, # distinct matches = 2:
-	355.2, 583.1
+	408.2, 614.1
 
 6,dial.c:377,408, # distinct matches = 1:
-	583.1
+	614.1
 
 
 6,dial.c:420,420, # distinct matches = 2:
-	200.2, 265.1
+	223.2, 291.1
 
 6,dial.c:421,422, # distinct matches = 3:
-	302.2, 200.2, 265.1
+	338.2, 223.2, 291.1
 
 6,dial.c:423,424, # distinct matches = 2:
-	302.2, 265.1
+	338.2, 291.1
 
 
 6,dial.c:426,430, # distinct matches = 1:
-	181.1
+	214.1
 
 6,dial.c:431,438, # distinct matches = 1:
-	152.1
+	1.1
 
 
 6,dial.c:442,448, # distinct matches = 1:
-	4.1, 269.1
+	38.1, 312.1
 
 6,dial.c:449,451, # distinct matches = 3:
-	160.1, 159.1, 4.1, 269.1
+	195.1, 194.1, 38.1, 312.1
 
 6,dial.c:452,452, # distinct matches = 1:
-	4.1, 269.1
+	38.1, 312.1
 
 
 6,dial.c:475,477, # distinct matches = 2:
-	161.1, 159.2, 4.1
+	195.2, 197.1, 38.1
 
 
 
 6,dial.c:485,491, # distinct matches = 1:
-	170.1
+	217.1
 
 
 6,dial.c:500,521, # distinct matches = 1:
-	2.1
+	35.1
 
 6,dial.c:522,529, # distinct matches = 5:
-	556.1, 345.1, 347.2, 558.1, 2.1
+	379.2, 377.1, 582.1, 584.1, 35.1
 
 6,dial.c:530,562, # distinct matches = 1:
-	2.1
+	35.1
 
 7,dial.thread.c:4,6, # distinct matches = 7:
-	132.2, 137.1, 138.2, 134.2, 135.2, 136.1, 133.2
+	149.1, 145.2, 146.2, 147.2, 148.2, 151.2, 150.1
 
 7,dial.thread.c:7,9, # distinct matches = 6:
-	132.2, 137.1, 134.2, 135.2, 136.1, 133.2
+	149.1, 145.2, 146.2, 147.2, 148.2, 150.1
 
 
 7,dial.thread.c:24,49, # distinct matches = 1:
-	561.2
+	2.2
 
 
 7,dial.thread.c:64,67, # distinct matches = 1:
-	362.2
+	416.2
 
 
 7,dial.thread.c:85,105, # distinct matches = 1:
-	257.2
+	303.2
 
 7,dial.thread.c:106,109, # distinct matches = 3:
-	99.2, 101.1, 257.2
+	172.2, 170.1, 303.2
 
 7,dial.thread.c:110,112, # distinct matches = 1:
-	257.2
+	303.2
 
 7,dial.thread.c:113,115, # distinct matches = 2:
-	33.2, 257.2
+	68.2, 303.2
 
 7,dial.thread.c:116,119, # distinct matches = 3:
-	100.2, 101.2, 257.2
+	171.2, 170.2, 303.2
 
 7,dial.thread.c:120,139, # distinct matches = 1:
-	257.2
+	303.2
 
 7,dial.thread.c:140,140, # distinct matches = 3:
-	343.2, 242.1, 257.2
+	281.1, 375.2, 303.2
 
 7,dial.thread.c:141,144, # distinct matches = 2:
-	343.2, 242.1
+	281.1, 375.2
 
 
 7,dial.thread.c:149,149, # distinct matches = 4:
-	493.1, 491.1, 231.1, 232.2
+	521.1, 268.1, 512.1, 264.2
 
 7,dial.thread.c:150,152, # distinct matches = 5:
-	520.2, 493.1, 491.1, 231.1, 232.2
+	562.2, 521.1, 268.1, 512.1, 264.2
 
 7,dial.thread.c:153,157, # distinct matches = 1:
-	520.2
+	562.2
 
 7,dial.thread.c:158,158, # distinct matches = 4:
-	479.2, 480.1, 223.1, 520.2
+	506.2, 256.1, 504.1, 562.2
 
 7,dial.thread.c:159,159, # distinct matches = 5:
-	505.2, 479.2, 480.1, 223.1, 520.2
+	530.2, 506.2, 256.1, 504.1, 562.2
 
 7,dial.thread.c:160,161, # distinct matches = 4:
-	505.2, 479.2, 480.1, 223.1
+	530.2, 506.2, 256.1, 504.1
 
 7,dial.thread.c:162,176, # distinct matches = 1:
-	505.2
+	530.2
 
 7,dial.thread.c:177,180, # distinct matches = 6:
-	82.2, 77.1, 78.1, 220.2, 85.1, 505.2
+	247.2, 81.1, 77.1, 76.1, 85.2, 530.2
 
 
 7,dial.thread.c:185,189, # distinct matches = 1:
-	17.2
+	25.2
 
 
 7,dial.thread.c:228,233, # distinct matches = 2:
-	242.2, 342.2
+	281.2, 374.2
 
 
 7,dial.thread.c:273,273, # distinct matches = 1:
-	502.2
+	540.2
 
 7,dial.thread.c:274,274, # distinct matches = 2:
-	3.1, 502.2
+	30.1, 540.2
 
 7,dial.thread.c:275,282, # distinct matches = 4:
-	332.2, 504.2, 3.1, 502.2
+	362.2, 529.2, 30.1, 540.2
 
 7,dial.thread.c:283,284, # distinct matches = 2:
-	332.2, 504.2
+	362.2, 529.2
 
 
 7,dial.thread.c:313,317, # distinct matches = 1:
-	3.2
+	30.2
 
 
 7,dial.thread.c:328,331, # distinct matches = 1:
-	441.2
+	496.2
 
 7,dial.thread.c:332,335, # distinct matches = 2:
-	310.1, 217.2
+	343.1, 249.2
 
 7,dial.thread.c:336,340, # distinct matches = 1:
-	217.2
+	249.2
 
 
 7,dial.thread.c:344,348, # distinct matches = 1:
-	318.2
+	352.2
 
 
 7,dial.thread.c:361,365, # distinct matches = 1:
-	97.2
+	175.2
 
 
 7,dial.thread.c:367,376, # distinct matches = 1:
-	583.2
+	614.2
 
 7,dial.thread.c:377,379, # distinct matches = 2:
-	356.2, 583.2
+	409.2, 614.2
 
 7,dial.thread.c:380,411, # distinct matches = 1:
-	583.2
+	614.2
 
 
 7,dial.thread.c:419,419, # distinct matches = 1:
-	265.2
+	291.2
 
 7,dial.thread.c:420,424, # distinct matches = 2:
-	310.2, 265.2
+	343.2, 291.2
 
 
 7,dial.thread.c:426,428, # distinct matches = 1:
-	181.2
+	214.2
 
 
 7,dial.thread.c:432,439, # distinct matches = 1:
-	152.2
+	1.2
 
 
 7,dial.thread.c:443,449, # distinct matches = 1:
-	269.2, 4.2 (coincides with 269.2)
+	312.2, 38.2 (coincides with 312.2)
 
 7,dial.thread.c:450,452, # distinct matches = 3:
-	162.1, 161.2, 269.2, 4.2 (coincides with 269.2)
+	197.2, 196.1, 312.2, 38.2 (coincides with 312.2)
 
 7,dial.thread.c:453,453, # distinct matches = 1:
-	269.2, 4.2 (coincides with 269.2)
+	312.2, 38.2 (coincides with 312.2)
 
 
 7,dial.thread.c:476,478, # distinct matches = 2:
-	162.2, 160.2, 4.2 (coincides with 269.2)
+	196.2, 194.2, 38.2 (coincides with 312.2)
 
 
 
 7,dial.thread.c:486,493, # distinct matches = 1:
-	170.2
+	217.2
 
 7,dial.thread.c:494,515, # distinct matches = 1:
-	2.2
+	35.2
 
 7,dial.thread.c:516,523, # distinct matches = 5:
-	346.1, 557.1, 559.1, 348.2, 2.2
+	376.1, 378.2, 583.1, 585.1, 35.2
 
 7,dial.thread.c:524,553, # distinct matches = 1:
-	2.2
+	35.2
 
 
 8,esmprint.c:6,9, # distinct matches = 2:
-	154.1, 155.1
+	189.1, 188.1
 
 8,esmprint.c:10,12, # distinct matches = 2:
-	36.1, 154.1
+	42.1, 188.1
 
 
 9,netssh.c:122,122, # distinct matches = 1:
-	598.1
+	599.1
 
 9,netssh.c:123,126, # distinct matches = 1:
-	506.1, 598.1
+	539.1, 599.1
 
 9,netssh.c:127,128, # distinct matches = 2:
-	154.2, 506.1, 598.1
+	188.2, 539.1, 599.1
 
 9,netssh.c:129,131, # distinct matches = 2:
-	154.2, 506.1
+	188.2, 539.1
 
 9,netssh.c:132,134, # distinct matches = 2:
-	35.1, 154.2
+	41.1, 188.2
 
 9,netssh.c:135,136, # distinct matches = 1:
-	35.1
+	41.1
 
 9,netssh.c:137,137, # distinct matches = 1:
-	110.1
+	152.1
 
 9,netssh.c:138,138, # distinct matches = 2:
-	598.2, 110.1
+	599.2, 152.1
 
 9,netssh.c:139,141, # distinct matches = 2:
-	506.2, 598.2 (coincides with 506.2), 110.1
+	539.2, 599.2 (coincides with 539.2), 152.1
 
 9,netssh.c:142,142, # distinct matches = 1:
-	506.2, 598.2 (coincides with 506.2)
+	539.2, 599.2 (coincides with 539.2)
 
 9,netssh.c:143,144, # distinct matches = 2:
-	155.2, 506.2, 598.2 (coincides with 506.2)
+	189.2, 539.2, 599.2 (coincides with 539.2)
 
 9,netssh.c:145,145, # distinct matches = 2:
-	155.2, 506.2
+	189.2, 539.2
 
 
 9,netssh.c:151,154, # distinct matches = 2:
-	35.2, 36.2
+	42.2, 41.2
 
 9,netssh.c:155,155, # distinct matches = 2:
-	110.2, 35.2
+	152.2, 41.2
 
 9,netssh.c:156,158, # distinct matches = 1:
-	110.2
+	152.2
 
 9,netssh.c:159,159, # distinct matches = 4:
-	27.1, 26.1, 25.1, 110.2
+	29.1, 27.1, 28.1, 152.2
 
 9,netssh.c:160,161, # distinct matches = 3:
-	27.1, 26.1, 25.1
+	29.1, 27.1, 28.1
 
 9,netssh.c:162,163, # distinct matches = 1:
-	25.1
+	27.1
 
 9,netssh.c:164,168, # distinct matches = 3:
-	514.1, 239.1, 25.1
+	277.1, 538.1, 27.1
 
 
 9,netssh.c:175,175, # distinct matches = 1:
-	352.1
+	419.1
 
 9,netssh.c:176,179, # distinct matches = 2:
-	144.1, 352.1
+	589.1, 419.1
 
 
 9,netssh.c:183,189, # distinct matches = 1:
-	151.1
+	24.1
 
 9,netssh.c:190,192, # distinct matches = 2:
-	564.1, 151.1
+	22.1, 24.1
 
 9,netssh.c:193,194, # distinct matches = 1:
-	151.1
-
-
-9,netssh.c:213,221, # distinct matches = 1:
-	515.1
+	24.1
 
-9,netssh.c:222,224, # distinct matches = 2:
-	515.2, 515.1
 
-9,netssh.c:225,233, # distinct matches = 1:
-	515.2
+9,netssh.c:214,222, # distinct matches = 1:
+	568.1
 
+9,netssh.c:223,225, # distinct matches = 2:
+	568.2, 568.1
 
-9,netssh.c:311,311, # distinct matches = 1:
-	609.1
+9,netssh.c:226,234, # distinct matches = 1:
+	568.2
 
-9,netssh.c:312,312, # distinct matches = 4:
-	602.1, 261.1, 608.1, 599.1, 609.1
 
-9,netssh.c:313,315, # distinct matches = 6:
-	335.1, 511.1, 602.1, 261.1, 608.1, 599.1, 609.1
-
-9,netssh.c:316,317, # distinct matches = 2:
-	335.1, 511.1, 599.1
+9,netssh.c:316,316, # distinct matches = 1:
+	610.1
 
+9,netssh.c:317,317, # distinct matches = 4:
+	284.1, 606.1, 603.1, 601.1, 610.1
 
-9,netssh.c:328,330, # distinct matches = 2:
-	92.1, 91.1
+9,netssh.c:318,320, # distinct matches = 6:
+	533.1, 367.1, 284.1, 606.1, 603.1, 601.1, 610.1
 
+9,netssh.c:321,322, # distinct matches = 3:
+	533.1, 367.1, 601.1
 
-9,netssh.c:334,337, # distinct matches = 1:
-	184.1
 
+9,netssh.c:333,335, # distinct matches = 2:
+	113.1, 112.1
 
-9,netssh.c:361,363, # distinct matches = 8:
-	462.1, 454.1, 459.1, 460.1, 461.1, 450.1, 449.1, 447.1
 
-9,netssh.c:364,364, # distinct matches = 6:
-	454.1, 459.1, 460.1, 450.1, 449.1, 447.1
+9,netssh.c:339,342, # distinct matches = 1:
+	219.1
 
-9,netssh.c:365,366, # distinct matches = 1:
-	447.1
 
+9,netssh.c:366,368, # distinct matches = 8:
+	403.1, 396.1, 395.1, 394.1, 385.1, 384.1, 382.1, 389.1
 
-9,netssh.c:377,377, # distinct matches = 1:
-	353.1
+9,netssh.c:369,369, # distinct matches = 6:
+	395.1, 394.1, 385.1, 384.1, 382.1, 389.1
 
-9,netssh.c:378,378, # distinct matches = 4:
-	548.1, 547.1, 549.1, 353.1
+9,netssh.c:370,371, # distinct matches = 1:
+	382.1
 
-9,netssh.c:379,379, # distinct matches = 15:
-	40.1, 45.1, 46.1, 44.1, 43.1, 47.1, 48.1, 49.1, 42.1, 41.1, 39.1, 548.1, 547.1, 549.1, 353.1
 
-9,netssh.c:380,380, # distinct matches = 18:
-	256.1, 574.1, 255.1, 40.1, 45.1, 46.1, 44.1, 43.1, 47.1, 48.1, 49.1, 42.1, 41.1, 39.1, 548.1, 547.1, 549.1, 353.1
+9,netssh.c:382,382, # distinct matches = 1:
+	417.1
 
-9,netssh.c:381,381, # distinct matches = 20:
-	493.2, 492.1, 496.1, 495.1, 494.1, 497.2, 256.1, 574.1, 255.1, 40.1, 45.1, 46.1, 44.1, 43.1, 47.1, 48.1, 49.1, 42.1, 41.1, 39.1
+9,netssh.c:383,383, # distinct matches = 4:
+	569.1, 576.1, 575.1, 417.1
 
-9,netssh.c:382,382, # distinct matches = 13:
-	493.2, 492.1, 496.1, 495.1, 494.1, 497.2, 256.1, 574.1, 255.1, 40.1, 42.1, 41.1, 39.1
+9,netssh.c:384,384, # distinct matches = 15:
+	60.1, 59.1, 62.1, 57.1, 63.1, 56.1, 65.1, 64.1, 61.1, 58.1, 55.1, 569.1, 576.1, 575.1, 417.1
 
-9,netssh.c:383,384, # distinct matches = 6:
-	493.2, 492.1, 496.1, 495.1, 494.1, 497.2
+9,netssh.c:385,385, # distinct matches = 18:
+	294.1, 9.1, 300.1, 60.1, 59.1, 62.1, 57.1, 63.1, 56.1, 65.1, 64.1, 61.1, 58.1, 55.1, 569.1, 576.1, 575.1, 417.1
 
+9,netssh.c:386,386, # distinct matches = 21:
+	517.1, 523.1, 516.2, 515.1, 514.1, 512.2, 513.1, 294.1, 9.1, 300.1, 60.1, 59.1, 62.1, 57.1, 63.1, 56.1, 65.1, 64.1, 61.1, 58.1, 55.1
 
-9,netssh.c:387,389, # distinct matches = 1:
-	65.1
+9,netssh.c:387,387, # distinct matches = 14:
+	517.1, 523.1, 516.2, 515.1, 514.1, 512.2, 513.1, 294.1, 9.1, 300.1, 57.1, 56.1, 58.1, 55.1
 
+9,netssh.c:388,389, # distinct matches = 7:
+	517.1, 523.1, 516.2, 515.1, 514.1, 512.2, 513.1
 
-9,netssh.c:391,391, # distinct matches = 3:
-	262.1, 606.1, 600.1
 
-9,netssh.c:392,394, # distinct matches = 7:
-	507.1, 238.1, 237.1, 508.1, 262.1, 606.1, 600.1
+9,netssh.c:392,394, # distinct matches = 1:
+	101.1
 
-9,netssh.c:395,396, # distinct matches = 5:
-	507.1, 238.1, 237.1, 508.1, 600.1
 
+9,netssh.c:396,396, # distinct matches = 3:
+	285.1, 600.1, 609.1
 
-9,netssh.c:405,411, # distinct matches = 3:
-	595.1, 597.1, 596.1
+9,netssh.c:397,399, # distinct matches = 7:
+	276.1, 535.1, 275.1, 536.1, 285.1, 600.1, 609.1
 
+9,netssh.c:400,401, # distinct matches = 5:
+	276.1, 535.1, 275.1, 536.1, 600.1
 
-9,netssh.c:418,421, # distinct matches = 2:
-	216.1, 215.1
 
+9,netssh.c:410,416, # distinct matches = 3:
+	595.1, 594.1, 593.1
 
-9,netssh.c:473,475, # distinct matches = 1:
-	298.1
 
-9,netssh.c:476,479, # distinct matches = 3:
-	264.1, 604.1, 298.1
+9,netssh.c:423,426, # distinct matches = 2:
+	253.1, 254.1
 
-9,netssh.c:480,483, # distinct matches = 1:
-	298.1
 
+9,netssh.c:478,480, # distinct matches = 1:
+	348.1
 
-9,netssh.c:488,489, # distinct matches = 3:
-	295.1, 211.1, 294.1
+9,netssh.c:481,484, # distinct matches = 3:
+	287.1, 608.1, 348.1
 
-9,netssh.c:490,492, # distinct matches = 4:
-	597.2, 295.1, 211.1, 294.1
+9,netssh.c:485,488, # distinct matches = 1:
+	348.1
 
-9,netssh.c:493,495, # distinct matches = 9:
-	456.1, 458.1, 460.2, 464.1, 467.1, 451.1, 597.2, 295.1, 294.1
 
-9,netssh.c:496,496, # distinct matches = 6:
-	456.1, 458.1, 460.2, 451.1, 295.1, 294.1
+9,netssh.c:493,494, # distinct matches = 3:
+	236.1, 309.1, 308.1
 
-9,netssh.c:497,499, # distinct matches = 2:
-	451.1, 294.1
+9,netssh.c:495,497, # distinct matches = 4:
+	594.2, 236.1, 309.1, 308.1
 
+9,netssh.c:498,500, # distinct matches = 9:
+	401.1, 398.1, 395.2, 393.1, 391.1, 386.1, 594.2, 309.1, 308.1
 
-9,netssh.c:516,519, # distinct matches = 2:
-	213.1, 63.1
+9,netssh.c:501,501, # distinct matches = 6:
+	395.2, 393.1, 391.1, 386.1, 309.1, 308.1
 
+9,netssh.c:502,504, # distinct matches = 2:
+	386.1, 308.1
 
-9,netssh.c:550,550, # distinct matches = 2:
-	50.1, 51.1
 
-9,netssh.c:551,552, # distinct matches = 8:
-	607.1, 603.1, 604.2, 605.1, 606.2, 608.2, 50.1, 51.1
+9,netssh.c:521,524, # distinct matches = 2:
+	252.1, 99.1
 
-9,netssh.c:553,554, # distinct matches = 6:
-	607.1, 603.1, 604.2, 605.1, 606.2, 608.2
 
+9,netssh.c:555,555, # distinct matches = 2:
+	53.1, 54.1
 
-9,netssh.c:561,570, # distinct matches = 1:
-	1.1
+9,netssh.c:556,557, # distinct matches = 8:
+	607.1, 606.2, 604.1, 608.2, 609.2, 605.1, 53.1, 54.1
 
+9,netssh.c:558,559, # distinct matches = 6:
+	607.1, 606.2, 604.1, 608.2, 609.2, 605.1
 
-9,netssh.c:579,581, # distinct matches = 1:
-	350.1
 
+9,netssh.c:566,575, # distinct matches = 1:
+	71.1
 
-9,netssh.c:591,592, # distinct matches = 5:
-	376.2, 371.1, 202.1, 373.2, 276.1
 
-9,netssh.c:593,593, # distinct matches = 6:
-	359.1, 376.2, 371.1, 202.1, 373.2, 276.1
+9,netssh.c:584,586, # distinct matches = 1:
+	406.1
 
-9,netssh.c:594,594, # distinct matches = 3:
-	551.1, 359.1, 202.1
 
-9,netssh.c:595,595, # distinct matches = 2:
-	551.1, 359.1
+9,netssh.c:596,597, # distinct matches = 5:
+	466.2, 461.1, 463.2, 246.1, 330.1
 
-9,netssh.c:596,596, # distinct matches = 3:
-	37.1, 551.1, 359.1
+9,netssh.c:598,598, # distinct matches = 6:
+	412.1, 466.2, 461.1, 463.2, 246.1, 330.1
 
-9,netssh.c:597,599, # distinct matches = 4:
-	335.2, 510.1, 334.1, 37.1
+9,netssh.c:599,599, # distinct matches = 3:
+	587.1, 412.1, 246.1
 
-9,netssh.c:600,601, # distinct matches = 3:
-	335.2, 510.1, 334.1
+9,netssh.c:600,600, # distinct matches = 2:
+	587.1, 412.1
 
-9,netssh.c:602,603, # distinct matches = 2:
-	93.1, 334.1
+9,netssh.c:601,601, # distinct matches = 3:
+	43.1, 587.1, 412.1
 
-9,netssh.c:604,605, # distinct matches = 1:
-	93.1
+9,netssh.c:602,604, # distinct matches = 4:
+	366.1, 367.2, 532.1, 43.1
 
+9,netssh.c:605,606, # distinct matches = 3:
+	366.1, 367.2, 532.1
 
-9,netssh.c:608,608, # distinct matches = 1:
-	585.1
+9,netssh.c:607,608, # distinct matches = 2:
+	109.1, 366.1
 
-9,netssh.c:609,610, # distinct matches = 4:
-	430.1, 431.1, 429.1, 585.1
+9,netssh.c:609,610, # distinct matches = 1:
+	109.1
 
-9,netssh.c:611,613, # distinct matches = 8:
-	462.2, 467.2, 468.1, 466.1, 430.1, 431.1, 429.1, 585.1
 
+9,netssh.c:613,613, # distinct matches = 1:
+	592.1
 
-9,netssh.c:619,623, # distinct matches = 1:
-	109.1
+9,netssh.c:614,615, # distinct matches = 4:
+	501.1, 502.1, 497.1, 592.1
 
+9,netssh.c:616,618, # distinct matches = 8:
+	398.2, 399.1, 396.2, 397.1, 501.1, 502.1, 497.1, 592.1
 
-9,netssh.c:626,627, # distinct matches = 1:
-	146.1
 
-9,netssh.c:628,629, # distinct matches = 9:
-	389.1, 280.1, 282.1, 292.1, 204.1, 390.1, 46.2, 281.1, 146.1
+9,netssh.c:624,628, # distinct matches = 1:
+	129.1
 
-9,netssh.c:630,630, # distinct matches = 10:
-	541.1, 389.1, 280.1, 282.1, 292.1, 204.1, 390.1, 46.2, 281.1, 146.1
 
 9,netssh.c:631,632, # distinct matches = 1:
-	541.1
-
+	588.1
 
-9,netssh.c:645,647, # distinct matches = 4:
-	545.1, 549.2, 542.1, 543.1
+9,netssh.c:633,634, # distinct matches = 9:
+	449.1, 323.1, 325.1, 324.1, 241.1, 65.2, 322.1, 450.1, 588.1
 
-9,netssh.c:648,648, # distinct matches = 3:
-	146.2, 542.1, 543.1
+9,netssh.c:635,635, # distinct matches = 10:
+	577.1, 449.1, 323.1, 325.1, 324.1, 241.1, 65.2, 322.1, 450.1, 588.1
 
-9,netssh.c:649,649, # distinct matches = 1:
-	146.2
+9,netssh.c:636,637, # distinct matches = 1:
+	577.1
 
-9,netssh.c:650,652, # distinct matches = 9:
-	283.1, 203.1, 291.1, 387.1, 388.1, 45.2, 285.1, 284.1, 146.2
 
+9,netssh.c:650,652, # distinct matches = 4:
+	570.1, 575.2, 574.1, 571.1
 
-9,netssh.c:658,660, # distinct matches = 9:
-	392.1, 391.1, 282.2, 279.1, 289.1, 47.2, 283.2, 278.1, 288.1
+9,netssh.c:653,653, # distinct matches = 3:
+	588.2, 570.1, 571.1
 
+9,netssh.c:654,654, # distinct matches = 1:
+	588.2
 
-9,netssh.c:662,664, # distinct matches = 1:
-	60.1
+9,netssh.c:655,657, # distinct matches = 9:
+	447.1, 242.1, 64.2, 318.1, 448.1, 319.1, 321.1, 320.1, 588.2
 
-9,netssh.c:665,665, # distinct matches = 4:
-	382.1, 381.1, 42.2, 60.1
 
-9,netssh.c:666,668, # distinct matches = 7:
-	580.1, 247.1, 246.1, 382.1, 381.1, 42.2, 60.1
+9,netssh.c:663,665, # distinct matches = 9:
+	315.1, 316.1, 318.2, 325.2, 326.1, 62.2, 444.1, 443.1, 317.1
 
 
-9,netssh.c:671,673, # distinct matches = 9:
-	396.1, 279.2, 208.1, 287.1, 281.2, 207.1, 285.2, 48.2, 395.1
+9,netssh.c:667,669, # distinct matches = 1:
+	124.1
 
+9,netssh.c:670,670, # distinct matches = 4:
+	437.1, 57.2, 438.1, 124.1
 
-9,netssh.c:676,681, # distinct matches = 1:
-	188.1
+9,netssh.c:671,673, # distinct matches = 7:
+	4.1, 296.1, 298.1, 437.1, 57.2, 438.1, 124.1
 
 
-9,netssh.c:687,687, # distinct matches = 1:
-	38.1
+9,netssh.c:676,678, # distinct matches = 9:
+	319.2, 244.1, 445.1, 245.1, 322.2, 317.2, 327.1, 63.2, 446.1
 
-9,netssh.c:688,689, # distinct matches = 4:
-	544.1, 542.2, 547.2, 38.1
 
-9,netssh.c:690,690, # distinct matches = 5:
-	573.1, 544.1, 542.2, 547.2, 38.1
+9,netssh.c:681,686, # distinct matches = 1:
+	235.1
 
-9,netssh.c:691,691, # distinct matches = 3:
-	573.1, 544.1, 542.2
 
 9,netssh.c:692,692, # distinct matches = 1:
-	573.1
+	44.1
 
-9,netssh.c:693,693, # distinct matches = 2:
-	184.2, 573.1
+9,netssh.c:693,694, # distinct matches = 4:
+	576.2, 571.2, 572.1, 44.1
 
-9,netssh.c:694,696, # distinct matches = 1:
-	184.2
+9,netssh.c:695,695, # distinct matches = 5:
+	12.1, 576.2, 571.2, 572.1, 44.1
 
+9,netssh.c:696,696, # distinct matches = 3:
+	12.1, 571.2, 572.1
 
-9,netssh.c:706,706, # distinct matches = 1:
-	353.2
+9,netssh.c:697,697, # distinct matches = 1:
+	12.1
 
-9,netssh.c:707,708, # distinct matches = 4:
-	543.2, 544.2, 546.1, 353.2
+9,netssh.c:698,698, # distinct matches = 2:
+	219.2, 12.1
 
-9,netssh.c:709,709, # distinct matches = 5:
-	188.2, 543.2, 544.2, 546.1, 353.2
+9,netssh.c:699,701, # distinct matches = 1:
+	219.2
 
-9,netssh.c:710,710, # distinct matches = 3:
-	188.2, 543.2, 544.2
 
-9,netssh.c:711,715, # distinct matches = 1:
-	188.2
+9,netssh.c:711,711, # distinct matches = 1:
+	417.2
 
+9,netssh.c:712,713, # distinct matches = 4:
+	572.2, 570.2, 573.1, 417.2
 
-9,netssh.c:718,718, # distinct matches = 1:
-	38.2
+9,netssh.c:714,714, # distinct matches = 5:
+	235.2, 572.2, 570.2, 573.1, 417.2
 
-9,netssh.c:719,720, # distinct matches = 4:
-	546.2, 545.2, 548.2, 38.2
+9,netssh.c:715,715, # distinct matches = 3:
+	235.2, 572.2, 570.2
 
-9,netssh.c:721,721, # distinct matches = 5:
-	562.1, 546.2, 545.2, 548.2, 38.2
+9,netssh.c:716,720, # distinct matches = 1:
+	235.2
 
-9,netssh.c:722,722, # distinct matches = 2:
-	91.2, 562.1
 
-9,netssh.c:723,723, # distinct matches = 12:
-	39.2, 391.2, 389.2, 395.2, 387.2, 385.1, 383.1, 381.2, 380.1, 393.1, 91.2, 562.1
+9,netssh.c:723,723, # distinct matches = 1:
+	44.2
 
-9,netssh.c:724,724, # distinct matches = 15:
-	254.1, 253.1, 575.1, 39.2, 391.2, 389.2, 395.2, 387.2, 385.1, 383.1, 381.2, 380.1, 393.1, 91.2, 562.1
+9,netssh.c:724,725, # distinct matches = 4:
+	573.2, 569.2, 574.2, 44.2
 
-9,netssh.c:725,725, # distinct matches = 17:
-	484.1, 482.1, 483.1, 254.1, 253.1, 575.1, 39.2, 391.2, 389.2, 395.2, 387.2, 385.1, 383.1, 381.2, 380.1, 393.1, 562.1
+9,netssh.c:726,726, # distinct matches = 5:
+	23.1, 573.2, 569.2, 574.2, 44.2
 
-9,netssh.c:726,726, # distinct matches = 11:
-	507.2, 484.1, 482.1, 483.1, 254.1, 253.1, 575.1, 39.2, 381.2, 380.1, 562.1
+9,netssh.c:727,727, # distinct matches = 2:
+	112.2, 23.1
 
-9,netssh.c:727,728, # distinct matches = 4:
-	507.2, 484.1, 482.1, 483.1
+9,netssh.c:728,728, # distinct matches = 12:
+	439.1, 445.2, 441.1, 449.2, 447.2, 443.2, 55.2, 438.2, 453.1, 451.1, 112.2, 23.1
 
-9,netssh.c:729,730, # distinct matches = 1:
-	507.2
+9,netssh.c:729,729, # distinct matches = 15:
+	293.1, 301.1, 8.1, 439.1, 445.2, 441.1, 449.2, 447.2, 443.2, 55.2, 438.2, 453.1, 451.1, 112.2, 23.1
 
+9,netssh.c:730,730, # distinct matches = 17:
+	510.1, 511.1, 509.1, 293.1, 301.1, 8.1, 439.1, 445.2, 441.1, 449.2, 447.2, 443.2, 55.2, 438.2, 453.1, 451.1, 23.1
 
-9,netssh.c:732,734, # distinct matches = 1:
-	95.1
+9,netssh.c:731,731, # distinct matches = 11:
+	535.2, 510.1, 511.1, 509.1, 293.1, 301.1, 8.1, 439.1, 55.2, 438.2, 23.1
 
+9,netssh.c:732,733, # distinct matches = 4:
+	535.2, 510.1, 511.1, 509.1
 
-9,netssh.c:739,740, # distinct matches = 1:
-	594.1
+9,netssh.c:734,735, # distinct matches = 1:
+	535.2
 
-9,netssh.c:741,742, # distinct matches = 3:
-	428.1, 431.2, 594.1
 
-9,netssh.c:743,745, # distinct matches = 7:
-	461.2, 465.1, 464.2, 463.1, 428.1, 431.2, 594.1
+9,netssh.c:737,739, # distinct matches = 1:
+	108.1
 
 
-9,netssh.c:750,753, # distinct matches = 1:
-	109.2
+9,netssh.c:744,745, # distinct matches = 1:
+	597.1
 
-9,netssh.c:754,754, # distinct matches = 2:
-	541.2, 109.2
+9,netssh.c:746,747, # distinct matches = 3:
+	497.2, 500.1, 597.1
 
-9,netssh.c:755,756, # distinct matches = 1:
-	541.2
+9,netssh.c:748,750, # distinct matches = 7:
+	402.1, 400.1, 401.2, 403.2, 497.2, 500.1, 597.1
 
 
-9,netssh.c:758,761, # distinct matches = 2:
-	67.1, 214.1
+9,netssh.c:755,758, # distinct matches = 1:
+	129.2
 
+9,netssh.c:759,759, # distinct matches = 2:
+	577.2, 129.2
 
-9,netssh.c:793,793, # distinct matches = 3:
-	498.1, 499.1, 500.1
+9,netssh.c:760,761, # distinct matches = 1:
+	577.2
 
-9,netssh.c:794,795, # distinct matches = 10:
-	574.2, 575.2, 576.1, 578.1, 579.1, 580.2, 577.1, 498.1, 499.1, 500.1
 
-9,netssh.c:796,796, # distinct matches = 9:
-	551.2, 550.1, 574.2, 575.2, 576.1, 578.1, 579.1, 580.2, 577.1
+9,netssh.c:763,766, # distinct matches = 2:
+	255.1, 102.1
 
-9,netssh.c:797,798, # distinct matches = 4:
-	70.1, 66.1, 551.2, 550.1
 
-9,netssh.c:799,799, # distinct matches = 3:
-	70.1, 66.1, 550.1
+9,netssh.c:798,798, # distinct matches = 3:
+	526.1, 527.1, 525.1
 
-9,netssh.c:800,800, # distinct matches = 1:
-	66.1
+9,netssh.c:799,800, # distinct matches = 10:
+	5.1, 6.1, 9.2, 8.2, 4.2, 7.1, 10.1, 526.1, 527.1, 525.1
 
+9,netssh.c:801,801, # distinct matches = 9:
+	587.2, 586.1, 5.1, 6.1, 9.2, 8.2, 4.2, 7.1, 10.1
 
-9,netssh.c:806,807, # distinct matches = 1:
-	65.2
+9,netssh.c:802,803, # distinct matches = 4:
+	105.1, 104.1, 587.2, 586.1
 
-9,netssh.c:808,808, # distinct matches = 2:
-	360.1, 65.2
+9,netssh.c:804,804, # distinct matches = 3:
+	105.1, 104.1, 586.1
 
-9,netssh.c:809,810, # distinct matches = 1:
-	360.1
+9,netssh.c:805,805, # distinct matches = 1:
+	104.1
 
 
-9,netssh.c:819,821, # distinct matches = 1:
-	360.2
+9,netssh.c:811,812, # distinct matches = 1:
+	101.2
 
+9,netssh.c:813,813, # distinct matches = 2:
+	414.1, 101.2
 
-9,netssh.c:828,830, # distinct matches = 3:
-	415.1, 69.1, 66.2
+9,netssh.c:814,815, # distinct matches = 1:
+	414.1
 
-9,netssh.c:831,831, # distinct matches = 1:
-	66.2
 
+9,netssh.c:824,826, # distinct matches = 1:
+	414.2
 
-9,netssh.c:835,835, # distinct matches = 4:
-	415.2, 68.1, 214.2, 70.2
 
-9,netssh.c:836,837, # distinct matches = 12:
-	290.1, 291.2, 292.2, 383.2, 208.2, 384.1, 43.2, 289.2, 415.2, 68.1, 214.2, 70.2
+9,netssh.c:833,835, # distinct matches = 3:
+	104.2, 480.1, 106.1
 
-9,netssh.c:838,838, # distinct matches = 10:
-	290.1, 291.2, 292.2, 383.2, 208.2, 384.1, 43.2, 289.2, 68.1, 214.2
+9,netssh.c:836,836, # distinct matches = 1:
+	104.2
 
 
-9,netssh.c:841,844, # distinct matches = 2:
-	64.1, 63.2
+9,netssh.c:840,840, # distinct matches = 4:
+	480.2, 103.1, 255.2, 105.2
 
+9,netssh.c:841,842, # distinct matches = 12:
+	453.2, 244.2, 329.1, 324.2, 321.2, 316.2, 59.2, 454.1, 480.2, 103.1, 255.2, 105.2
 
-9,netssh.c:853,861, # distinct matches = 1:
-	1.2
+9,netssh.c:843,843, # distinct matches = 10:
+	453.2, 244.2, 329.1, 324.2, 321.2, 316.2, 59.2, 454.1, 103.1, 255.2
 
 
-9,netssh.c:865,865, # distinct matches = 1:
-	350.2
+9,netssh.c:846,849, # distinct matches = 2:
+	99.2, 100.1
 
-9,netssh.c:866,866, # distinct matches = 2:
-	359.2, 350.2
 
-9,netssh.c:867,867, # distinct matches = 3:
-	550.2, 359.2, 350.2
+9,netssh.c:858,866, # distinct matches = 1:
+	71.2
 
-9,netssh.c:868,868, # distinct matches = 5:
-	69.2, 67.2, 68.2, 550.2, 359.2
 
-9,netssh.c:869,869, # distinct matches = 13:
-	393.2, 278.2, 280.2, 284.2, 286.1, 207.2, 394.1, 49.2, 69.2, 67.2, 68.2, 550.2, 359.2
+9,netssh.c:870,870, # distinct matches = 1:
+	406.2
 
-9,netssh.c:870,870, # distinct matches = 13:
-	581.1, 393.2, 278.2, 280.2, 284.2, 286.1, 207.2, 394.1, 49.2, 69.2, 67.2, 68.2, 550.2
+9,netssh.c:871,871, # distinct matches = 2:
+	412.2, 406.2
 
-9,netssh.c:871,871, # distinct matches = 11:
-	581.1, 393.2, 278.2, 280.2, 284.2, 286.1, 207.2, 394.1, 49.2, 67.2, 68.2
+9,netssh.c:872,872, # distinct matches = 3:
+	586.2, 412.2, 406.2
 
-9,netssh.c:872,873, # distinct matches = 5:
-	602.2, 600.2, 601.1, 603.2, 581.1
+9,netssh.c:873,873, # distinct matches = 5:
+	106.2, 102.2, 103.2, 586.2, 412.2
 
-9,netssh.c:874,875, # distinct matches = 4:
-	602.2, 600.2, 601.1, 603.2
+9,netssh.c:874,874, # distinct matches = 13:
+	323.2, 61.2, 328.1, 315.2, 441.2, 442.1, 320.2, 245.2, 106.2, 102.2, 103.2, 586.2, 412.2
 
-9,netssh.c:876,877, # distinct matches = 1:
-	600.2
+9,netssh.c:875,875, # distinct matches = 13:
+	11.1, 323.2, 61.2, 328.1, 315.2, 441.2, 442.1, 320.2, 245.2, 106.2, 102.2, 103.2, 586.2
 
-9,netssh.c:878,878, # distinct matches = 1:
-	95.2
+9,netssh.c:876,876, # distinct matches = 11:
+	11.1, 323.2, 61.2, 328.1, 315.2, 441.2, 442.1, 320.2, 245.2, 102.2, 103.2
 
-9,netssh.c:879,880, # distinct matches = 2:
-	94.1, 95.2
+9,netssh.c:877,878, # distinct matches = 5:
+	603.2, 602.1, 604.2, 600.2, 11.1
 
-9,netssh.c:881,881, # distinct matches = 1:
-	94.1
+9,netssh.c:879,880, # distinct matches = 4:
+	603.2, 602.1, 604.2, 600.2
 
-9,netssh.c:882,883, # distinct matches = 3:
-	294.2, 296.1, 94.1
+9,netssh.c:881,882, # distinct matches = 1:
+	600.2
 
-9,netssh.c:884,886, # distinct matches = 4:
-	596.2, 294.2, 296.1, 94.1
+9,netssh.c:883,883, # distinct matches = 1:
+	108.2
 
-9,netssh.c:887,889, # distinct matches = 9:
-	466.2, 463.2, 459.2, 457.1, 455.1, 452.1, 596.2, 294.2, 94.1
+9,netssh.c:884,885, # distinct matches = 2:
+	110.1, 108.2
 
-9,netssh.c:890,890, # distinct matches = 6:
-	459.2, 457.1, 455.1, 452.1, 294.2, 94.1
+9,netssh.c:886,886, # distinct matches = 1:
+	110.1
 
-9,netssh.c:891,893, # distinct matches = 2:
-	452.1, 294.2
+9,netssh.c:887,888, # distinct matches = 3:
+	311.1, 308.2, 110.1
 
+9,netssh.c:889,891, # distinct matches = 4:
+	595.2, 311.1, 308.2, 110.1
 
-9,netssh.c:898,898, # distinct matches = 1:
-	205.1
+9,netssh.c:892,894, # distinct matches = 9:
+	400.2, 387.1, 390.1, 392.1, 397.2, 394.2, 595.2, 308.2, 110.1
 
-9,netssh.c:899,899, # distinct matches = 2:
-	215.2, 205.1
+9,netssh.c:895,895, # distinct matches = 6:
+	387.1, 390.1, 392.1, 394.2, 308.2, 110.1
 
-9,netssh.c:900,902, # distinct matches = 3:
-	51.2, 215.2, 205.1
+9,netssh.c:896,898, # distinct matches = 2:
+	387.1, 308.2
 
 
-9,netssh.c:904,906, # distinct matches = 1:
-	111.1
+9,netssh.c:903,903, # distinct matches = 1:
+	240.1
 
+9,netssh.c:904,904, # distinct matches = 2:
+	253.2, 240.1
 
-9,netssh.c:910,913, # distinct matches = 2:
-	213.2, 64.2
+9,netssh.c:905,907, # distinct matches = 3:
+	54.2, 253.2, 240.1
 
 
-9,netssh.c:916,916, # distinct matches = 1:
-	205.2
+9,netssh.c:909,911, # distinct matches = 1:
+	153.1
 
-9,netssh.c:917,917, # distinct matches = 2:
-	216.2, 205.2
 
-9,netssh.c:918,920, # distinct matches = 3:
-	50.2, 216.2, 205.2
+9,netssh.c:915,918, # distinct matches = 2:
+	100.2, 252.2
 
 
-9,netssh.c:922,922, # distinct matches = 1:
-	111.2
+9,netssh.c:921,921, # distinct matches = 1:
+	240.2
 
-9,netssh.c:923,923, # distinct matches = 7:
-	599.2 (coincides with 261.2), 601.2, 264.2, 263.1, 262.2, 261.2, 607.2, 111.2
+9,netssh.c:922,922, # distinct matches = 2:
+	254.2, 240.2
 
-9,netssh.c:924,924, # distinct matches = 9:
-	334.2, 509.1, 599.2 (coincides with 261.2), 601.2, 264.2, 263.1, 262.2, 261.2, 607.2, 111.2
+9,netssh.c:923,925, # distinct matches = 3:
+	53.2, 254.2, 240.2
 
-9,netssh.c:925,926, # distinct matches = 8:
-	334.2, 509.1, 599.2 (coincides with 261.2), 601.2, 264.2, 263.1, 262.2, 261.2, 607.2
 
-9,netssh.c:927,928, # distinct matches = 2:
-	334.2, 509.1, 599.2 (coincides with 261.2)
+9,netssh.c:927,927, # distinct matches = 1:
+	153.2
 
-9,netssh.c:929,930, # distinct matches = 1:
-	334.2
+9,netssh.c:928,928, # distinct matches = 7:
+	601.2, 284.2 (coincides with 601.2), 285.2, 287.2, 605.2, 286.1, 602.2, 153.2
 
+9,netssh.c:929,929, # distinct matches = 9:
+	531.1, 366.2, 601.2, 284.2 (coincides with 601.2), 285.2, 287.2, 605.2, 286.1, 602.2, 153.2
 
-9,netssh.c:934,934, # distinct matches = 1:
-	585.2
+9,netssh.c:930,931, # distinct matches = 8:
+	531.1, 366.2, 601.2, 284.2 (coincides with 601.2), 285.2, 287.2, 605.2, 286.1, 602.2
 
-9,netssh.c:935,936, # distinct matches = 4:
-	426.1, 427.1, 428.2, 585.2
+9,netssh.c:932,933, # distinct matches = 3:
+	531.1, 366.2, 601.2
 
-9,netssh.c:937,939, # distinct matches = 8:
-	448.1, 455.2, 456.2, 447.2, 426.1, 427.1, 428.2, 585.2
+9,netssh.c:934,935, # distinct matches = 1:
+	366.2
 
-9,netssh.c:940,940, # distinct matches = 6:
-	448.1, 455.2, 456.2, 447.2, 426.1, 427.1
 
-9,netssh.c:941,942, # distinct matches = 1:
-	447.2
+9,netssh.c:939,939, # distinct matches = 1:
+	592.2
 
+9,netssh.c:940,941, # distinct matches = 4:
+	498.1, 499.1, 500.2, 592.2
 
-9,netssh.c:954,956, # distinct matches = 9:
-	385.2, 288.2, 203.2, 290.2, 204.2, 287.2, 44.2, 286.2, 386.1
+9,netssh.c:942,944, # distinct matches = 8:
+	391.2, 390.2, 383.1, 382.2, 498.1, 499.1, 500.2, 592.2
 
-9,netssh.c:957,959, # distinct matches = 1:
-	60.2
+9,netssh.c:945,945, # distinct matches = 6:
+	391.2, 390.2, 383.1, 382.2, 498.1, 499.1
 
-9,netssh.c:960,960, # distinct matches = 4:
-	380.2, 41.2, 379.1, 60.2
+9,netssh.c:946,947, # distinct matches = 1:
+	382.2
 
-9,netssh.c:961,963, # distinct matches = 7:
-	577.2, 249.1, 250.1, 380.2, 41.2, 379.1, 60.2
 
+9,netssh.c:959,961, # distinct matches = 9:
+	329.2, 328.2, 327.2, 241.2, 326.2, 242.2, 452.1, 451.2, 60.2
 
-9,netssh.c:965,967, # distinct matches = 1:
-	573.2
+9,netssh.c:962,964, # distinct matches = 1:
+	124.2
 
-9,netssh.c:968,968, # distinct matches = 2:
-	562.2, 573.2
+9,netssh.c:965,965, # distinct matches = 4:
+	439.2, 440.1, 58.2, 124.2
 
-9,netssh.c:969,969, # distinct matches = 2:
-	92.2, 562.2
+9,netssh.c:966,968, # distinct matches = 7:
+	295.1, 10.2, 299.1, 439.2, 440.1, 58.2, 124.2
 
-9,netssh.c:970,970, # distinct matches = 12:
-	379.2, 390.2, 388.2, 40.2, 394.2, 386.2, 384.2, 382.2, 396.2, 392.2, 92.2, 562.2
 
-9,netssh.c:971,971, # distinct matches = 15:
-	576.2, 252.1, 251.1, 379.2, 390.2, 388.2, 40.2, 394.2, 386.2, 384.2, 382.2, 396.2, 392.2, 92.2, 562.2
+9,netssh.c:970,972, # distinct matches = 1:
+	12.2
 
-9,netssh.c:972,972, # distinct matches = 17:
-	478.2, 477.1, 480.2, 576.2, 252.1, 251.1, 379.2, 390.2, 388.2, 40.2, 394.2, 386.2, 384.2, 382.2, 396.2, 392.2, 562.2
+9,netssh.c:973,973, # distinct matches = 2:
+	23.2, 12.2
 
-9,netssh.c:973,973, # distinct matches = 10:
-	478.2, 477.1, 480.2, 576.2, 252.1, 251.1, 379.2, 40.2, 382.2, 562.2
+9,netssh.c:974,974, # distinct matches = 2:
+	113.2, 23.2
 
-9,netssh.c:974,975, # distinct matches = 3:
-	478.2, 477.1, 480.2
+9,netssh.c:975,975, # distinct matches = 12:
+	437.2, 448.2, 444.2, 450.2, 452.2, 454.2, 442.2, 440.2, 56.2, 446.2, 113.2, 23.2
 
+9,netssh.c:976,976, # distinct matches = 15:
+	302.1, 7.2, 292.1, 437.2, 448.2, 444.2, 450.2, 452.2, 454.2, 442.2, 440.2, 56.2, 446.2, 113.2, 23.2
 
-9,netssh.c:1003,1006, # distinct matches = 1:
-	22.1
+9,netssh.c:977,977, # distinct matches = 17:
+	504.2, 508.2, 505.1, 302.1, 7.2, 292.1, 437.2, 448.2, 444.2, 450.2, 452.2, 454.2, 442.2, 440.2, 56.2, 446.2, 23.2
 
+9,netssh.c:978,978, # distinct matches = 10:
+	504.2, 508.2, 505.1, 302.1, 7.2, 292.1, 437.2, 440.2, 56.2, 23.2
 
-9,netssh.c:1012,1015, # distinct matches = 1:
-	22.2
+9,netssh.c:979,980, # distinct matches = 3:
+	504.2, 508.2, 505.1
 
 
-9,netssh.c:1047,1049, # distinct matches = 1:
-	610.1
+9,netssh.c:1008,1011, # distinct matches = 1:
+	96.1
 
 
-9,netssh.c:1056,1059, # distinct matches = 1:
-	206.1
+9,netssh.c:1017,1020, # distinct matches = 1:
+	96.2
 
 
-9,netssh.c:1061,1061, # distinct matches = 1:
-	164.1, 147.1
+9,netssh.c:1052,1054, # distinct matches = 1:
+	611.1
 
-9,netssh.c:1062,1066, # distinct matches = 3:
-	238.2, 235.1, 164.1, 147.1
 
-9,netssh.c:1067,1067, # distinct matches = 2:
-	235.1, 164.1, 147.1
+9,netssh.c:1061,1064, # distinct matches = 1:
+	243.1
 
-9,netssh.c:1068,1070, # distinct matches = 2:
-	235.1, 147.1
 
+9,netssh.c:1066,1066, # distinct matches = 1:
+	174.1, 198.1
 
-9,netssh.c:1076,1077, # distinct matches = 1:
-	593.1
+9,netssh.c:1067,1071, # distinct matches = 3:
+	276.2, 274.1, 174.1, 198.1
 
-9,netssh.c:1078,1079, # distinct matches = 3:
-	427.2, 429.2, 593.1
+9,netssh.c:1072,1072, # distinct matches = 2:
+	274.1, 174.1, 198.1
 
-9,netssh.c:1080,1083, # distinct matches = 7:
-	452.2, 453.1, 454.2, 451.2, 427.2, 429.2, 593.1
+9,netssh.c:1073,1075, # distinct matches = 2:
+	274.1, 174.1
 
-9,netssh.c:1084,1084, # distinct matches = 6:
-	452.2, 453.1, 454.2, 451.2, 427.2, 593.1
 
-9,netssh.c:1085,1085, # distinct matches = 2:
-	452.2, 451.2
+9,netssh.c:1081,1082, # distinct matches = 1:
+	596.1
 
-9,netssh.c:1086,1087, # distinct matches = 4:
-	358.1, 357.1, 452.2, 451.2
+9,netssh.c:1083,1084, # distinct matches = 3:
+	499.2, 501.2, 596.1
 
-9,netssh.c:1088,1088, # distinct matches = 2:
-	358.1, 357.1
+9,netssh.c:1085,1088, # distinct matches = 7:
+	389.2, 386.2, 388.1, 387.2, 499.2, 501.2, 596.1
 
-9,netssh.c:1089,1095, # distinct matches = 1:
-	357.1
+9,netssh.c:1089,1089, # distinct matches = 6:
+	389.2, 386.2, 388.1, 387.2, 499.2, 596.1
 
+9,netssh.c:1090,1090, # distinct matches = 2:
+	386.2, 387.2
 
-9,netssh.c:1123,1129, # distinct matches = 1:
-	275.1
+9,netssh.c:1091,1092, # distinct matches = 4:
+	411.1, 410.1, 386.2, 387.2
 
+9,netssh.c:1093,1093, # distinct matches = 2:
+	411.1, 410.1
 
-9,netssh.c:1145,1147, # distinct matches = 4:
-	612.1, 613.1, 615.1, 614.1
+9,netssh.c:1094,1100, # distinct matches = 1:
+	410.1
 
 
-9,netssh.c:1158,1163, # distinct matches = 1:
-	275.2
+9,netssh.c:1128,1134, # distinct matches = 1:
+	332.1
 
 
-9,netssh.c:1186,1188, # distinct matches = 4:
-	267.1, 615.2, 268.1, 266.1
+9,netssh.c:1150,1152, # distinct matches = 4:
+	34.1, 33.1, 31.1, 32.1
 
-9,netssh.c:1189,1189, # distinct matches = 3:
-	267.1, 268.1, 266.1
 
+9,netssh.c:1163,1168, # distinct matches = 1:
+	332.2
 
-9,netssh.c:1204,1204, # distinct matches = 4:
-	372.1, 370.1, 368.2, 371.2
 
-9,netssh.c:1205,1206, # distinct matches = 5:
-	474.1, 372.1, 370.1, 368.2, 371.2
+9,netssh.c:1191,1193, # distinct matches = 4:
+	306.1, 307.1, 305.1, 32.2
 
-9,netssh.c:1207,1207, # distinct matches = 1:
-	474.1
+9,netssh.c:1194,1194, # distinct matches = 3:
+	306.1, 307.1, 305.1
 
 
-9,netssh.c:1220,1222, # distinct matches = 5:
-	377.2, 374.2, 277.1, 202.2, 372.2
+9,netssh.c:1209,1209, # distinct matches = 4:
+	469.2, 460.1, 459.1, 461.2
 
-9,netssh.c:1223,1223, # distinct matches = 1:
-	202.2
+9,netssh.c:1210,1211, # distinct matches = 5:
+	591.1, 469.2, 460.1, 459.1, 461.2
 
-9,netssh.c:1224,1226, # distinct matches = 2:
-	105.1, 106.1
+9,netssh.c:1212,1212, # distinct matches = 1:
+	591.1
 
-9,netssh.c:1227,1229, # distinct matches = 2:
-	311.1, 105.1
 
+9,netssh.c:1225,1227, # distinct matches = 5:
+	465.2, 462.2, 331.1, 460.2, 246.2
 
-9,netssh.c:1231,1232, # distinct matches = 1:
-	15.1
+9,netssh.c:1228,1228, # distinct matches = 1:
+	246.2
 
-9,netssh.c:1233,1235, # distinct matches = 2:
-	182.1, 15.1
+9,netssh.c:1229,1231, # distinct matches = 2:
+	165.1, 164.1
 
-9,netssh.c:1236,1238, # distinct matches = 4:
-	267.2, 614.2, 182.1, 15.1
+9,netssh.c:1232,1234, # distinct matches = 2:
+	190.1, 164.1
 
-9,netssh.c:1239,1239, # distinct matches = 3:
-	267.2, 182.1, 15.1
 
+9,netssh.c:1236,1237, # distinct matches = 1:
+	97.1
 
-9,netssh.c:1245,1247, # distinct matches = 3:
-	234.1, 498.2, 186.1
+9,netssh.c:1238,1240, # distinct matches = 2:
+	215.1, 97.1
 
+9,netssh.c:1241,1243, # distinct matches = 4:
+	307.2, 34.2, 215.1, 97.1
 
-9,netssh.c:1249,1250, # distinct matches = 1:
-	298.2
+9,netssh.c:1244,1244, # distinct matches = 3:
+	307.2, 215.1, 97.1
 
-9,netssh.c:1251,1251, # distinct matches = 3:
-	609.2, 610.2, 298.2
 
-9,netssh.c:1252,1252, # distinct matches = 5:
-	605.2, 263.2, 609.2, 610.2, 298.2
+9,netssh.c:1250,1252, # distinct matches = 3:
+	527.2, 220.1, 271.1
 
-9,netssh.c:1253,1253, # distinct matches = 7:
-	236.1, 235.2, 605.2, 263.2, 609.2, 610.2, 298.2
 
-9,netssh.c:1254,1255, # distinct matches = 6:
-	236.1, 235.2, 605.2, 263.2, 609.2, 298.2
+9,netssh.c:1254,1255, # distinct matches = 1:
+	348.2
 
-9,netssh.c:1256,1259, # distinct matches = 3:
-	236.1, 235.2, 298.2
+9,netssh.c:1256,1256, # distinct matches = 3:
+	610.2, 611.2, 348.2
 
-9,netssh.c:1260,1261, # distinct matches = 2:
-	236.1, 235.2
+9,netssh.c:1257,1257, # distinct matches = 5:
+	286.2, 607.2, 610.2, 611.2, 348.2
 
+9,netssh.c:1258,1258, # distinct matches = 7:
+	274.2, 273.1, 286.2, 607.2, 610.2, 611.2, 348.2
 
-9,netssh.c:1264,1265, # distinct matches = 3:
-	296.2, 297.1, 211.2
+9,netssh.c:1259,1260, # distinct matches = 6:
+	274.2, 273.1, 286.2, 607.2, 610.2, 348.2
 
-9,netssh.c:1266,1267, # distinct matches = 5:
-	594.2, 593.2, 296.2, 297.1, 211.2
+9,netssh.c:1261,1264, # distinct matches = 3:
+	274.2, 273.1, 348.2
 
-9,netssh.c:1268,1268, # distinct matches = 7:
-	426.2, 430.2, 594.2, 593.2, 296.2, 297.1, 211.2
+9,netssh.c:1265,1266, # distinct matches = 2:
+	274.2, 273.1
 
-9,netssh.c:1269,1269, # distinct matches = 4:
-	426.2, 430.2, 594.2, 593.2
 
-9,netssh.c:1270,1272, # distinct matches = 8:
-	449.2, 446.1, 457.2, 458.2, 426.2, 430.2, 594.2, 593.2
+9,netssh.c:1269,1270, # distinct matches = 3:
+	310.1, 236.2, 311.2
 
-9,netssh.c:1273,1273, # distinct matches = 6:
-	449.2, 446.1, 457.2, 458.2, 426.2, 593.2
+9,netssh.c:1271,1272, # distinct matches = 5:
+	596.2, 597.2, 310.1, 236.2, 311.2
 
-9,netssh.c:1274,1276, # distinct matches = 2:
-	357.2, 446.1
+9,netssh.c:1273,1273, # distinct matches = 7:
+	502.2, 498.2, 596.2, 597.2, 310.1, 236.2, 311.2
 
-9,netssh.c:1277,1282, # distinct matches = 1:
-	357.2
+9,netssh.c:1274,1274, # distinct matches = 4:
+	502.2, 498.2, 596.2, 597.2
 
+9,netssh.c:1275,1277, # distinct matches = 8:
+	392.2, 381.1, 393.2, 385.2, 502.2, 498.2, 596.2, 597.2
 
-9,netssh.c:1310,1310, # distinct matches = 1:
-	16.1
+9,netssh.c:1278,1278, # distinct matches = 6:
+	392.2, 381.1, 393.2, 385.2, 498.2, 596.2
 
-9,netssh.c:1311,1315, # distinct matches = 1:
-	416.1, 16.1
+9,netssh.c:1279,1281, # distinct matches = 2:
+	410.2, 381.1
 
-9,netssh.c:1316,1317, # distinct matches = 2:
-	401.1, 416.1, 16.1
+9,netssh.c:1282,1287, # distinct matches = 1:
+	410.2
 
-9,netssh.c:1318,1319, # distinct matches = 2:
-	401.1, 416.1
 
+9,netssh.c:1315,1315, # distinct matches = 1:
+	107.1
 
-9,netssh.c:1324,1324, # distinct matches = 1:
-	32.1
+9,netssh.c:1316,1320, # distinct matches = 1:
+	479.1, 107.1
 
-9,netssh.c:1325,1326, # distinct matches = 2:
-	32.2, 32.1
+9,netssh.c:1321,1322, # distinct matches = 2:
+	455.1, 479.1, 107.1
 
-9,netssh.c:1327,1327, # distinct matches = 1:
-	32.2
+9,netssh.c:1323,1324, # distinct matches = 2:
+	455.1, 479.1
 
 
-9,netssh.c:1333,1336, # distinct matches = 2:
-	401.2, 402.1
+9,netssh.c:1329,1329, # distinct matches = 1:
+	67.1
 
+9,netssh.c:1330,1331, # distinct matches = 2:
+	67.2, 67.1
 
-9,netssh.c:1339,1339, # distinct matches = 1:
-	16.2
+9,netssh.c:1332,1332, # distinct matches = 1:
+	67.2
 
-9,netssh.c:1340,1340, # distinct matches = 1:
-	416.2, 16.2 (coincides with 416.2)
 
-9,netssh.c:1341,1342, # distinct matches = 2:
-	402.2, 416.2, 16.2 (coincides with 416.2)
+9,netssh.c:1338,1341, # distinct matches = 2:
+	456.1, 455.2
 
-9,netssh.c:1343,1344, # distinct matches = 2:
-	402.2, 416.2
 
+9,netssh.c:1344,1344, # distinct matches = 1:
+	107.2
 
-9,netssh.c:1356,1358, # distinct matches = 5:
-	277.2, 378.2, 370.2, 369.2, 276.2
+9,netssh.c:1345,1345, # distinct matches = 1:
+	479.2, 107.2 (coincides with 479.2)
 
-9,netssh.c:1359,1359, # distinct matches = 1:
-	164.2 (coincides with 147.2), 147.2
+9,netssh.c:1346,1347, # distinct matches = 2:
+	456.2, 479.2, 107.2 (coincides with 479.2)
 
-9,netssh.c:1360,1364, # distinct matches = 3:
-	237.2, 236.2, 164.2 (coincides with 147.2), 147.2
+9,netssh.c:1348,1349, # distinct matches = 2:
+	456.2, 479.2
 
-9,netssh.c:1365,1365, # distinct matches = 2:
-	236.2, 164.2 (coincides with 147.2), 147.2
 
-9,netssh.c:1366,1366, # distinct matches = 2:
-	236.2, 147.2
+9,netssh.c:1362,1364, # distinct matches = 5:
+	467.2, 459.2, 464.2, 330.2, 331.2
 
-9,netssh.c:1367,1368, # distinct matches = 3:
-	94.2, 236.2, 147.2
+9,netssh.c:1365,1365, # distinct matches = 1:
+	174.2, 198.2 (coincides with 174.2)
 
-9,netssh.c:1369,1369, # distinct matches = 1:
-	94.2
+9,netssh.c:1366,1370, # distinct matches = 3:
+	273.2, 275.2, 174.2, 198.2 (coincides with 174.2)
 
-9,netssh.c:1370,1371, # distinct matches = 3:
-	297.2, 295.2, 94.2
+9,netssh.c:1371,1371, # distinct matches = 2:
+	273.2, 174.2, 198.2 (coincides with 174.2)
 
-9,netssh.c:1372,1374, # distinct matches = 4:
-	595.2, 297.2, 295.2, 94.2
+9,netssh.c:1372,1372, # distinct matches = 2:
+	273.2, 174.2
 
-9,netssh.c:1375,1377, # distinct matches = 9:
-	468.2, 448.2, 465.2, 453.2, 446.2, 450.2, 595.2, 295.2, 94.2
+9,netssh.c:1373,1374, # distinct matches = 3:
+	110.2, 273.2, 174.2
 
-9,netssh.c:1378,1378, # distinct matches = 6:
-	448.2, 453.2, 446.2, 450.2, 295.2, 94.2
+9,netssh.c:1375,1375, # distinct matches = 1:
+	110.2
 
-9,netssh.c:1379,1381, # distinct matches = 2:
-	358.2, 446.2
+9,netssh.c:1376,1377, # distinct matches = 3:
+	310.2, 309.2, 110.2
 
+9,netssh.c:1378,1380, # distinct matches = 4:
+	593.2, 310.2, 309.2, 110.2
 
-9,netssh.c:1410,1413, # distinct matches = 1:
-	93.2
+9,netssh.c:1381,1383, # distinct matches = 9:
+	402.2, 388.2, 399.2, 381.2, 384.2, 383.2, 593.2, 309.2, 110.2
 
+9,netssh.c:1384,1384, # distinct matches = 6:
+	388.2, 381.2, 384.2, 383.2, 309.2, 110.2
 
-9,netssh.c:1441,1442, # distinct matches = 1:
-	15.2
+9,netssh.c:1385,1387, # distinct matches = 2:
+	411.2, 381.2
 
-9,netssh.c:1443,1445, # distinct matches = 2:
-	183.1, 15.2
 
-9,netssh.c:1446,1448, # distinct matches = 4:
-	268.2, 613.2, 183.1, 15.2
+9,netssh.c:1416,1419, # distinct matches = 1:
+	109.2
 
-9,netssh.c:1449,1449, # distinct matches = 3:
-	268.2, 183.1, 15.2
 
+9,netssh.c:1447,1448, # distinct matches = 1:
+	97.2
 
-9,netssh.c:1460,1463, # distinct matches = 1:
-	349.1
+9,netssh.c:1449,1451, # distinct matches = 2:
+	216.1, 97.2
 
+9,netssh.c:1452,1454, # distinct matches = 4:
+	31.2, 306.2, 216.1, 97.2
 
-9,netssh.c:1478,1480, # distinct matches = 1:
-	474.2
+9,netssh.c:1455,1455, # distinct matches = 3:
+	306.2, 216.1, 97.2
 
-9,netssh.c:1481,1481, # distinct matches = 2:
-	105.2, 474.2
 
-9,netssh.c:1482,1486, # distinct matches = 1:
-	105.2
+9,netssh.c:1466,1469, # distinct matches = 1:
+	405.1
 
 
-9,netssh.c:1489,1491, # distinct matches = 2:
-	182.2, 183.2
+9,netssh.c:1484,1486, # distinct matches = 1:
+	591.2
 
-9,netssh.c:1492,1494, # distinct matches = 4:
-	612.2, 266.2, 182.2, 183.2
+9,netssh.c:1487,1487, # distinct matches = 2:
+	164.2, 591.2
 
-9,netssh.c:1495,1495, # distinct matches = 6:
-	485.1, 224.1, 482.2, 266.2, 182.2, 183.2
+9,netssh.c:1488,1492, # distinct matches = 1:
+	164.2
 
-9,netssh.c:1496,1498, # distinct matches = 6:
-	510.2, 511.2, 509.2, 485.1, 224.1, 482.2
 
-9,netssh.c:1499,1500, # distinct matches = 3:
-	510.2, 511.2, 509.2
+9,netssh.c:1495,1497, # distinct matches = 2:
+	216.2, 215.2
 
+9,netssh.c:1498,1500, # distinct matches = 4:
+	305.2, 33.2, 216.2, 215.2
 
-9,netssh.c:1524,1527, # distinct matches = 1:
-	37.2
+9,netssh.c:1501,1501, # distinct matches = 6:
+	259.1, 509.2, 257.1, 305.2, 216.2, 215.2
 
+9,netssh.c:1502,1504, # distinct matches = 6:
+	533.2, 532.2, 531.2, 259.1, 509.2, 257.1
 
-9,netssh.c:1582,1585, # distinct matches = 3:
-	21.1, 24.1, 19.1
+9,netssh.c:1505,1506, # distinct matches = 3:
+	533.2, 532.2, 531.2
 
-9,netssh.c:1586,1589, # distinct matches = 3:
-	21.2, 20.1, 19.1
 
+9,netssh.c:1530,1533, # distinct matches = 1:
+	43.2
 
-9,netssh.c:1672,1674, # distinct matches = 2:
-	244.1, 245.1
 
+9,netssh.c:1588,1591, # distinct matches = 3:
+	95.1, 91.1, 92.1
 
-9,netssh.c:1687,1691, # distinct matches = 1:
-	470.2
+9,netssh.c:1592,1595, # distinct matches = 3:
+	94.1, 95.2, 91.1
 
 
-9,netssh.c:1693,1695, # distinct matches = 1:
-	222.1
+9,netssh.c:1678,1680, # distinct matches = 2:
+	282.1, 283.1
 
 
-9,netssh.c:1701,1703, # distinct matches = 7:
-	256.2, 246.2, 248.1, 579.2, 252.2, 253.2, 249.2
+9,netssh.c:1693,1697, # distinct matches = 1:
+	178.2
 
 
-9,netssh.c:1721,1726, # distinct matches = 1:
-	72.1
+9,netssh.c:1699,1701, # distinct matches = 1:
+	200.1
 
 
-9,netssh.c:1758,1762, # distinct matches = 1:
-	243.1
+9,netssh.c:1707,1709, # distinct matches = 7:
+	292.2, 295.2, 293.2, 296.2, 6.2, 297.1, 294.2
 
 
-9,netssh.c:1782,1784, # distinct matches = 1:
-	150.1
+9,netssh.c:1727,1732, # distinct matches = 1:
+	125.1
 
 
-9,netssh.c:1789,1791, # distinct matches = 1:
-	150.2
+9,netssh.c:1764,1768, # distinct matches = 1:
+	280.1
 
 
-9,netssh.c:1798,1800, # distinct matches = 3:
-	432.1, 433.1, 434.1
+9,netssh.c:1788,1790, # distinct matches = 1:
+	36.1
 
 
-9,netssh.c:1802,1811, # distinct matches = 5:
-	167.2, 218.1, 307.2, 417.1, 304.2, 300.2
+9,netssh.c:1795,1797, # distinct matches = 1:
+	36.2
 
 
-9,netssh.c:1814,1817, # distinct matches = 1:
-	592.1
+9,netssh.c:1804,1806, # distinct matches = 3:
+	482.1, 483.1, 484.1
 
 
-9,netssh.c:1819,1822, # distinct matches = 1:
-	206.2
+9,netssh.c:1808,1817, # distinct matches = 5:
+	335.2, 201.2, 333.2, 472.1, 250.1, 340.2
 
 
-9,netssh.c:1830,1834, # distinct matches = 5:
-	301.2, 305.2, 219.2, 417.2 (coincides with 218.2), 308.2, 218.2
+9,netssh.c:1820,1823, # distinct matches = 1:
+	598.1
 
 
+9,netssh.c:1825,1828, # distinct matches = 1:
+	243.2
 
-9,netssh.c:1856,1860, # distinct matches = 1:
-	414.1
 
+9,netssh.c:1836,1840, # distinct matches = 5:
+	250.2, 336.2, 472.2 (coincides with 250.2), 334.2, 251.2, 341.2
 
-9,netssh.c:1865,1867, # distinct matches = 1:
-	29.1
 
 
-9,netssh.c:1897,1899, # distinct matches = 1:
-	29.2
+9,netssh.c:1862,1866, # distinct matches = 1:
+	481.1
 
 
-9,netssh.c:1908,1913, # distinct matches = 1:
-	72.2
+9,netssh.c:1871,1873, # distinct matches = 1:
+	37.1
 
 
-9,netssh.c:1922,1924, # distinct matches = 1:
-	354.1
+9,netssh.c:1903,1905, # distinct matches = 1:
+	37.2
 
 
-9,netssh.c:1965,1977, # distinct matches = 1:
-	414.2
+9,netssh.c:1914,1919, # distinct matches = 1:
+	125.2
 
-9,netssh.c:1978,1981, # distinct matches = 1:
-	592.2
 
+9,netssh.c:1928,1930, # distinct matches = 1:
+	407.1
 
-9,netssh.c:1995,1997, # distinct matches = 1:
-	354.2
 
+9,netssh.c:1971,1983, # distinct matches = 1:
+	481.2
 
-9,netssh.c:2065,2069, # distinct matches = 1:
-	243.2
+9,netssh.c:1984,1987, # distinct matches = 1:
+	598.2
 
 
-9,netssh.c:2072,2073, # distinct matches = 1:
-	102.1
+9,netssh.c:2001,2003, # distinct matches = 1:
+	407.2
 
-9,netssh.c:2074,2074, # distinct matches = 2:
-	331.1, 102.1
 
-9,netssh.c:2075,2078, # distinct matches = 1:
-	331.1
+9,netssh.c:2071,2075, # distinct matches = 1:
+	280.2
 
 
-9,netssh.c:2082,2087, # distinct matches = 2:
-	165.1, 148.1
+9,netssh.c:2078,2079, # distinct matches = 1:
+	161.1
 
-9,netssh.c:2088,2089, # distinct matches = 1:
-	148.1
+9,netssh.c:2080,2080, # distinct matches = 2:
+	364.1, 161.1
 
+9,netssh.c:2081,2084, # distinct matches = 1:
+	364.1
 
-9,netssh.c:2132,2135, # distinct matches = 2:
-	104.1, 103.1
 
+9,netssh.c:2088,2093, # distinct matches = 2:
+	313.1, 39.1
 
-9,netssh.c:2142,2147, # distinct matches = 1:
-	31.1
+9,netssh.c:2094,2095, # distinct matches = 1:
+	39.1
 
-9,netssh.c:2148,2150, # distinct matches = 1:
-	611.1
 
+9,netssh.c:2138,2141, # distinct matches = 2:
+	162.1, 163.1
 
-9,netssh.c:2155,2157, # distinct matches = 3:
-	158.1, 472.1, 157.1
 
+9,netssh.c:2148,2153, # distinct matches = 1:
+	66.1
 
-9,netssh.c:2165,2165, # distinct matches = 3:
-	158.2, 471.1, 156.1
+9,netssh.c:2154,2156, # distinct matches = 1:
+	612.1
 
-9,netssh.c:2166,2167, # distinct matches = 4:
-	104.2, 158.2, 471.1, 156.1
 
-9,netssh.c:2168,2169, # distinct matches = 2:
-	104.2, 471.1
+9,netssh.c:2161,2163, # distinct matches = 3:
+	193.1, 181.1, 192.1
 
 
-9,netssh.c:2185,2190, # distinct matches = 1:
-	31.2
+9,netssh.c:2171,2171, # distinct matches = 3:
+	191.1, 179.1, 192.2
 
+9,netssh.c:2172,2173, # distinct matches = 4:
+	162.2, 191.1, 179.1, 192.2
 
-9,netssh.c:2205,2205, # distinct matches = 3:
-	473.1, 157.2, 156.2
+9,netssh.c:2174,2175, # distinct matches = 2:
+	162.2, 179.1
 
-9,netssh.c:2206,2207, # distinct matches = 4:
-	102.2, 473.1, 157.2, 156.2
 
-9,netssh.c:2208,2208, # distinct matches = 4:
-	500.2, 233.1, 186.2, 102.2
+9,netssh.c:2191,2196, # distinct matches = 1:
+	66.2
 
-9,netssh.c:2209,2209, # distinct matches = 4:
-	582.1, 500.2, 233.1, 186.2
 
-9,netssh.c:2210,2210, # distinct matches = 8:
-	554.2, 553.1, 557.2, 556.2, 582.1, 500.2, 233.1, 186.2
+9,netssh.c:2211,2211, # distinct matches = 3:
+	191.2, 193.2, 180.1
 
-9,netssh.c:2211,2211, # distinct matches = 9:
-	79.2, 87.2, 86.2, 85.2, 554.2, 553.1, 557.2, 556.2, 582.1
+9,netssh.c:2212,2213, # distinct matches = 4:
+	161.2, 191.2, 193.2, 180.1
 
-9,netssh.c:2212,2214, # distinct matches = 10:
-	337.1, 79.2, 87.2, 86.2, 85.2, 554.2, 553.1, 557.2, 556.2, 582.1
+9,netssh.c:2214,2214, # distinct matches = 4:
+	526.2, 272.1, 220.2, 161.2
 
-9,netssh.c:2215,2216, # distinct matches = 1:
-	337.1
+9,netssh.c:2215,2215, # distinct matches = 4:
+	3.1, 526.2, 272.1, 220.2
 
+9,netssh.c:2216,2216, # distinct matches = 8:
+	581.1, 582.2, 583.2, 580.2, 3.1, 526.2, 272.1, 220.2
 
-9,netssh.c:2227,2228, # distinct matches = 1:
-	367.1
+9,netssh.c:2217,2217, # distinct matches = 9:
+	87.2, 81.2, 80.2, 82.2, 581.1, 582.2, 583.2, 580.2, 3.1
 
-9,netssh.c:2229,2229, # distinct matches = 2:
-	331.2, 367.1
+9,netssh.c:2218,2220, # distinct matches = 10:
+	373.1, 87.2, 81.2, 80.2, 82.2, 581.1, 582.2, 583.2, 580.2, 3.1
 
-9,netssh.c:2230,2233, # distinct matches = 1:
-	331.2
+9,netssh.c:2221,2222, # distinct matches = 1:
+	373.1
 
 
-9,netssh.c:2244,2249, # distinct matches = 2:
-	148.2, 149.1
+9,netssh.c:2233,2234, # distinct matches = 1:
+	458.1
 
-9,netssh.c:2250,2251, # distinct matches = 1:
-	148.2
+9,netssh.c:2235,2235, # distinct matches = 2:
+	364.2, 458.1
 
+9,netssh.c:2236,2239, # distinct matches = 1:
+	364.2
 
-9,netssh.c:2262,2267, # distinct matches = 1:
-	96.1
 
+9,netssh.c:2250,2255, # distinct matches = 2:
+	40.1, 39.2
 
-9,netssh.c:2269,2271, # distinct matches = 1:
-	326.1
+9,netssh.c:2256,2257, # distinct matches = 1:
+	39.2
 
 
-9,netssh.c:2310,2310, # distinct matches = 1:
-	107.1
+9,netssh.c:2268,2273, # distinct matches = 1:
+	126.1
 
-9,netssh.c:2311,2314, # distinct matches = 4:
-	570.1, 568.1, 566.1, 107.1
 
-9,netssh.c:2315,2315, # distinct matches = 1:
-	107.1
+9,netssh.c:2275,2277, # distinct matches = 1:
+	365.1
 
 
-9,netssh.c:2319,2319, # distinct matches = 1:
-	107.2
+9,netssh.c:2316,2316, # distinct matches = 1:
+	160.1
 
-9,netssh.c:2320,2323, # distinct matches = 4:
-	569.1, 571.1, 567.1, 107.2
+9,netssh.c:2317,2320, # distinct matches = 4:
+	14.1, 17.1, 20.1, 160.1
 
-9,netssh.c:2324,2324, # distinct matches = 2:
-	106.2, 107.2
+9,netssh.c:2321,2321, # distinct matches = 1:
+	160.1
 
-9,netssh.c:2325,2326, # distinct matches = 1:
-	106.2
 
+9,netssh.c:2325,2325, # distinct matches = 1:
+	160.2
 
-9,netssh.c:2351,2356, # distinct matches = 1:
-	71.1
+9,netssh.c:2326,2329, # distinct matches = 4:
+	16.1, 19.1, 13.1, 160.2
 
+9,netssh.c:2330,2330, # distinct matches = 2:
+	165.2, 160.2
 
-9,netssh.c:2359,2362, # distinct matches = 4:
-	351.1, 565.1, 569.2, 568.2
+9,netssh.c:2331,2332, # distinct matches = 1:
+	165.2
 
-9,netssh.c:2363,2363, # distinct matches = 1:
-	565.1
 
+9,netssh.c:2357,2362, # distinct matches = 1:
+	98.1
 
-9,netssh.c:2365,2367, # distinct matches = 1:
-	311.2
 
-9,netssh.c:2368,2371, # distinct matches = 4:
-	566.2, 572.1, 567.2, 565.2
+9,netssh.c:2365,2368, # distinct matches = 4:
+	17.2, 16.2, 418.1, 15.1
 
-9,netssh.c:2372,2372, # distinct matches = 1:
-	565.2
+9,netssh.c:2369,2369, # distinct matches = 1:
+	15.1
 
 
-9,netssh.c:2378,2380, # distinct matches = 1:
-	367.2
+9,netssh.c:2371,2373, # distinct matches = 1:
+	190.2
 
+9,netssh.c:2374,2377, # distinct matches = 4:
+	18.1, 19.2, 20.2, 15.2
 
-9,netssh.c:2387,2390, # distinct matches = 1:
-	349.2
+9,netssh.c:2378,2378, # distinct matches = 1:
+	15.2
 
 
-9,netssh.c:2397,2400, # distinct matches = 4:
-	572.2, 571.2, 570.2, 351.2
+9,netssh.c:2384,2386, # distinct matches = 1:
+	458.2
 
 
-9,netssh.c:2412,2417, # distinct matches = 1:
-	71.2
+9,netssh.c:2393,2396, # distinct matches = 1:
+	405.2
 
 
-9,netssh.c:2423,2423, # distinct matches = 1:
-	582.2
+9,netssh.c:2403,2406, # distinct matches = 4:
+	14.2, 418.2, 13.2, 18.2
 
-9,netssh.c:2424,2424, # distinct matches = 5:
-	558.2, 552.1, 559.2, 555.2, 582.2
 
-9,netssh.c:2425,2428, # distinct matches = 9:
-	78.2, 74.2, 73.2, 81.2, 558.2, 552.1, 559.2, 555.2, 582.2
+9,netssh.c:2418,2423, # distinct matches = 1:
+	98.2
 
 
-9,netssh.c:2431,2433, # distinct matches = 1:
-	611.2
+9,netssh.c:2429,2429, # distinct matches = 1:
+	3.2
 
+9,netssh.c:2430,2430, # distinct matches = 5:
+	585.2, 578.1, 579.2, 584.2, 3.2
 
-9,netssh.c:2440,2444, # distinct matches = 1:
-	337.2
+9,netssh.c:2431,2434, # distinct matches = 9:
+	77.2, 74.2, 89.2, 84.2, 585.2, 578.1, 579.2, 584.2, 3.2
 
 
-9,netssh.c:2449,2451, # distinct matches = 1:
-	108.1
+9,netssh.c:2437,2439, # distinct matches = 1:
+	612.2
 
 
-9,netssh.c:2502,2507, # distinct matches = 1:
-	96.2
+9,netssh.c:2446,2450, # distinct matches = 1:
+	373.2
 
 
-9,netssh.c:2509,2511, # distinct matches = 1:
-	326.2
+9,netssh.c:2455,2457, # distinct matches = 1:
+	128.1
 
 
-9,netssh.c:2519,2524, # distinct matches = 2:
-	149.2, 165.2
+9,netssh.c:2508,2513, # distinct matches = 1:
+	126.2
 
 
-9,netssh.c:2538,2538, # distinct matches = 3:
-	472.2, 473.2, 471.2
+9,netssh.c:2515,2517, # distinct matches = 1:
+	365.2
 
-9,netssh.c:2539,2540, # distinct matches = 4:
-	103.2, 472.2, 473.2, 471.2
 
-9,netssh.c:2541,2542, # distinct matches = 2:
-	103.2, 471.2
+9,netssh.c:2525,2530, # distinct matches = 2:
+	313.2, 40.2
 
 
-9,netssh.c:2554,2554, # distinct matches = 3:
-	486.1, 225.1, 224.2
+9,netssh.c:2544,2544, # distinct matches = 3:
+	179.2, 180.2, 181.2
 
-9,netssh.c:2555,2557, # distinct matches = 4:
-	508.2, 486.1, 225.1, 224.2
+9,netssh.c:2545,2546, # distinct matches = 4:
+	163.2, 179.2, 180.2, 181.2
 
-9,netssh.c:2558,2559, # distinct matches = 1:
-	508.2
+9,netssh.c:2547,2548, # distinct matches = 2:
+	163.2, 179.2
 
 
-9,netssh.c:2582,2594, # distinct matches = 1:
-	516.1
+9,netssh.c:2560,2560, # distinct matches = 3:
+	257.2, 261.1, 258.1
 
-9,netssh.c:2595,2595, # distinct matches = 6:
-	6.1, 271.1, 270.1, 273.1, 5.1, 274.1, 272.1, 516.1
+9,netssh.c:2561,2563, # distinct matches = 4:
+	536.2, 257.2, 261.1, 258.1
 
-9,netssh.c:2596,2598, # distinct matches = 5:
-	6.1, 271.1, 270.1, 273.1, 5.1, 274.1, 272.1
+9,netssh.c:2564,2565, # distinct matches = 1:
+	536.2
 
 
-9,netssh.c:2601,2602, # distinct matches = 1:
-	413.1, 6.1, 5.1
+9,netssh.c:2588,2600, # distinct matches = 1:
+	567.1
 
-9,netssh.c:2603,2607, # distinct matches = 2:
-	590.1, 413.1, 6.1, 5.1
+9,netssh.c:2601,2601, # distinct matches = 6:
+	123.1, 357.1, 122.1, 354.1, 355.1, 353.1, 356.1, 567.1
 
-9,netssh.c:2608,2608, # distinct matches = 3:
-	274.2, 590.1, 413.1, 6.1, 5.1
+9,netssh.c:2602,2604, # distinct matches = 5:
+	123.1, 357.1, 122.1, 354.1, 355.1, 353.1, 356.1
 
-9,netssh.c:2609,2611, # distinct matches = 2:
-	274.2, 413.1, 6.1, 5.1
 
+9,netssh.c:2607,2608, # distinct matches = 1:
+	432.1, 123.1, 122.1
 
-9,netssh.c:2614,2615, # distinct matches = 1:
-	212.1
+9,netssh.c:2609,2613, # distinct matches = 2:
+	616.1, 432.1, 123.1, 122.1
 
-9,netssh.c:2616,2620, # distinct matches = 2:
-	587.1, 212.1
+9,netssh.c:2614,2614, # distinct matches = 3:
+	357.2, 616.1, 432.1, 123.1, 122.1
 
-9,netssh.c:2621,2621, # distinct matches = 3:
-	271.2, 5.2 (coincides with 271.2), 587.1, 212.1
+9,netssh.c:2615,2617, # distinct matches = 2:
+	357.2, 432.1, 123.1, 122.1
 
-9,netssh.c:2622,2624, # distinct matches = 2:
-	271.2, 5.2 (coincides with 271.2), 212.1
 
-9,netssh.c:2625,2626, # distinct matches = 1:
-	5.2 (coincides with 271.2), 212.1
+9,netssh.c:2620,2621, # distinct matches = 1:
+	239.1
 
-9,netssh.c:2627,2628, # distinct matches = 2:
-	212.2, 5.2 (coincides with 271.2), 212.1
+9,netssh.c:2622,2626, # distinct matches = 2:
+	618.1, 239.1
 
-9,netssh.c:2629,2633, # distinct matches = 3:
-	586.1, 212.2, 5.2 (coincides with 271.2), 212.1
+9,netssh.c:2627,2627, # distinct matches = 3:
+	353.2, 122.2 (coincides with 353.2), 618.1, 239.1
 
-9,netssh.c:2634,2634, # distinct matches = 4:
-	270.2, 6.2 (coincides with 270.2), 586.1, 212.2, 5.2 (coincides with 271.2), 212.1
+9,netssh.c:2628,2630, # distinct matches = 2:
+	353.2, 122.2 (coincides with 353.2), 239.1
 
-9,netssh.c:2635,2637, # distinct matches = 3:
-	270.2, 6.2 (coincides with 270.2), 212.2, 5.2 (coincides with 271.2), 212.1
+9,netssh.c:2631,2632, # distinct matches = 1:
+	122.2 (coincides with 353.2), 239.1
 
-9,netssh.c:2638,2639, # distinct matches = 1:
-	6.2 (coincides with 270.2), 212.2
+9,netssh.c:2633,2634, # distinct matches = 2:
+	239.2, 122.2 (coincides with 353.2), 239.1
 
-9,netssh.c:2640,2641, # distinct matches = 2:
-	412.1, 6.2 (coincides with 270.2), 212.2
+9,netssh.c:2635,2639, # distinct matches = 3:
+	617.1, 239.2, 122.2 (coincides with 353.2), 239.1
 
-9,netssh.c:2642,2646, # distinct matches = 3:
-	588.1, 412.1, 6.2 (coincides with 270.2), 212.2
+9,netssh.c:2640,2640, # distinct matches = 4:
+	354.2, 123.2 (coincides with 354.2), 617.1, 239.2, 122.2 (coincides with 353.2), 239.1
 
-9,netssh.c:2647,2647, # distinct matches = 4:
-	273.2, 588.1, 412.1, 6.2 (coincides with 270.2), 212.2
+9,netssh.c:2641,2643, # distinct matches = 3:
+	354.2, 123.2 (coincides with 354.2), 239.2, 122.2 (coincides with 353.2), 239.1
 
-9,netssh.c:2648,2650, # distinct matches = 3:
-	273.2, 412.1, 6.2 (coincides with 270.2), 212.2
+9,netssh.c:2644,2645, # distinct matches = 1:
+	123.2 (coincides with 354.2), 239.2
 
-9,netssh.c:2651,2652, # distinct matches = 1:
-	412.1
+9,netssh.c:2646,2647, # distinct matches = 2:
+	431.1, 123.2 (coincides with 354.2), 239.2
 
-9,netssh.c:2653,2654, # distinct matches = 3:
-	412.2, 413.2, 412.1
+9,netssh.c:2648,2652, # distinct matches = 3:
+	620.1, 431.1, 123.2 (coincides with 354.2), 239.2
 
-9,netssh.c:2655,2659, # distinct matches = 4:
-	589.1, 412.2, 413.2, 412.1
+9,netssh.c:2653,2653, # distinct matches = 4:
+	355.2, 620.1, 431.1, 123.2 (coincides with 354.2), 239.2
 
-9,netssh.c:2660,2660, # distinct matches = 5:
-	272.2, 589.1, 412.2, 413.2, 412.1
+9,netssh.c:2654,2656, # distinct matches = 3:
+	355.2, 431.1, 123.2 (coincides with 354.2), 239.2
 
-9,netssh.c:2661,2663, # distinct matches = 3:
-	272.2, 412.2, 413.2
+9,netssh.c:2657,2658, # distinct matches = 1:
+	431.1
 
-9,netssh.c:2664,2667, # distinct matches = 1:
-	412.2
+9,netssh.c:2659,2660, # distinct matches = 3:
+	432.2, 431.2, 431.1
 
-9,netssh.c:2668,2672, # distinct matches = 2:
-	591.1, 412.2
+9,netssh.c:2661,2665, # distinct matches = 4:
+	619.1, 432.2, 431.2, 431.1
 
-9,netssh.c:2673,2673, # distinct matches = 4:
-	13.1, 11.1, 591.1, 412.2
+9,netssh.c:2666,2666, # distinct matches = 5:
+	356.2, 619.1, 432.2, 431.2, 431.1
 
-9,netssh.c:2674,2675, # distinct matches = 5:
-	11.2, 12.1, 13.1, 11.1, 591.1
+9,netssh.c:2667,2669, # distinct matches = 3:
+	356.2, 432.2, 431.2
 
-9,netssh.c:2676,2676, # distinct matches = 3:
-	11.2, 12.1, 591.1
+9,netssh.c:2670,2673, # distinct matches = 1:
+	431.2
 
-9,netssh.c:2677,2677, # distinct matches = 1:
-	591.1
+9,netssh.c:2674,2678, # distinct matches = 2:
+	615.1, 431.2
 
+9,netssh.c:2679,2679, # distinct matches = 4:
+	121.1, 120.1, 615.1, 431.2
 
-9,netssh.c:2679,2679, # distinct matches = 1:
-	425.2
+9,netssh.c:2680,2681, # distinct matches = 5:
+	118.1, 120.2, 121.1, 120.1, 615.1
 
-9,netssh.c:2680,2680, # distinct matches = 2:
-	424.1, 425.2
+9,netssh.c:2682,2682, # distinct matches = 3:
+	118.1, 120.2, 615.1
 
-9,netssh.c:2681,2681, # distinct matches = 3:
-	516.2, 424.1, 425.2
+9,netssh.c:2683,2683, # distinct matches = 1:
+	615.1
 
-9,netssh.c:2682,2683, # distinct matches = 2:
-	516.2, 424.1
 
-9,netssh.c:2684,2692, # distinct matches = 1:
-	516.2
+9,netssh.c:2685,2685, # distinct matches = 1:
+	470.2
 
-9,netssh.c:2693,2693, # distinct matches = 5:
-	9.1, 10.1, 8.1, 7.1, 516.2
+9,netssh.c:2686,2686, # distinct matches = 2:
+	478.1, 470.2
 
-9,netssh.c:2694,2695, # distinct matches = 4:
-	9.1, 10.1, 8.1, 7.1
+9,netssh.c:2687,2687, # distinct matches = 3:
+	567.2, 478.1, 470.2
 
-9,netssh.c:2696,2696, # distinct matches = 5:
-	445.1, 9.1, 10.1, 8.1, 7.1
+9,netssh.c:2688,2689, # distinct matches = 2:
+	567.2, 478.1
 
-9,netssh.c:2697,2697, # distinct matches = 3:
-	445.1, 8.1, 7.1
+9,netssh.c:2690,2698, # distinct matches = 1:
+	567.2
 
-9,netssh.c:2698,2698, # distinct matches = 5:
-	411.1, 180.1, 407.1, 179.1, 445.1, 8.1, 7.1
+9,netssh.c:2699,2699, # distinct matches = 5:
+	115.1, 114.1, 116.1, 117.1, 567.2
 
-9,netssh.c:2699,2701, # distinct matches = 6:
-	590.2, 411.1, 180.1, 407.1, 179.1, 445.1, 8.1, 7.1
+9,netssh.c:2700,2701, # distinct matches = 4:
+	115.1, 114.1, 116.1, 117.1
 
-9,netssh.c:2702,2704, # distinct matches = 5:
-	590.2, 411.1, 407.1, 445.1, 8.1, 7.1
+9,netssh.c:2702,2702, # distinct matches = 5:
+	494.1, 115.1, 114.1, 116.1, 117.1
 
-9,netssh.c:2705,2705, # distinct matches = 3:
-	407.1, 445.1, 8.1, 7.1
+9,netssh.c:2703,2703, # distinct matches = 3:
+	494.1, 115.1, 114.1
 
+9,netssh.c:2704,2704, # distinct matches = 5:
+	212.1, 430.1, 426.1, 213.1, 494.1, 115.1, 114.1
 
-9,netssh.c:2707,2708, # distinct matches = 3:
-	445.2, 444.1, 443.1
+9,netssh.c:2705,2707, # distinct matches = 6:
+	616.2, 212.1, 430.1, 426.1, 213.1, 494.1, 115.1, 114.1
 
-9,netssh.c:2709,2709, # distinct matches = 5:
-	173.1, 410.1, 174.1, 406.1, 209.1, 445.2, 444.1, 443.1
+9,netssh.c:2708,2710, # distinct matches = 5:
+	616.2, 430.1, 426.1, 494.1, 115.1, 114.1
 
-9,netssh.c:2710,2712, # distinct matches = 6:
-	587.2, 173.1, 410.1, 174.1, 406.1, 209.1, 445.2, 444.1, 443.1
+9,netssh.c:2711,2711, # distinct matches = 4:
+	426.1, 494.1, 115.1, 114.1
 
-9,netssh.c:2713,2714, # distinct matches = 5:
-	587.2, 410.1, 406.1, 209.1, 445.2, 444.1, 443.1
 
-9,netssh.c:2715,2715, # distinct matches = 6:
-	8.2, 587.2, 410.1, 406.1, 209.1, 445.2, 444.1, 443.1
+9,netssh.c:2713,2714, # distinct matches = 3:
+	492.1, 494.2, 493.1
 
-9,netssh.c:2716,2716, # distinct matches = 5:
-	8.2, 406.1, 209.1, 445.2, 444.1, 443.1
+9,netssh.c:2715,2715, # distinct matches = 5:
+	428.1, 208.1, 425.1, 209.1, 237.1, 492.1, 494.2, 493.1
 
-9,netssh.c:2717,2717, # distinct matches = 4:
-	8.2, 406.1, 209.1, 443.1
+9,netssh.c:2716,2718, # distinct matches = 6:
+	618.2, 428.1, 208.1, 425.1, 209.1, 237.1, 492.1, 494.2, 493.1
 
-9,netssh.c:2718,2718, # distinct matches = 5:
-	444.2, 8.2, 406.1, 209.1, 443.1
+9,netssh.c:2719,2720, # distinct matches = 5:
+	618.2, 428.1, 425.1, 237.1, 492.1, 494.2, 493.1
 
-9,netssh.c:2719,2719, # distinct matches = 3:
-	444.2, 8.2, 209.1
+9,netssh.c:2721,2721, # distinct matches = 6:
+	115.2, 618.2, 428.1, 425.1, 237.1, 492.1, 494.2, 493.1
 
-9,netssh.c:2720,2720, # distinct matches = 5:
-	178.1, 209.2, 177.1, 409.1, 405.1, 210.1, 444.2 (coincides with 209.2), 8.2, 209.1
+9,netssh.c:2722,2722, # distinct matches = 5:
+	115.2, 425.1, 237.1, 492.1, 494.2, 493.1
 
-9,netssh.c:2721,2723, # distinct matches = 6:
-	586.2, 178.1, 209.2, 177.1, 409.1, 405.1, 210.1, 444.2 (coincides with 209.2), 8.2, 209.1
+9,netssh.c:2723,2723, # distinct matches = 4:
+	115.2, 425.1, 237.1, 492.1
 
-9,netssh.c:2724,2724, # distinct matches = 6:
-	586.2, 209.2, 409.1, 405.1, 210.1, 444.2 (coincides with 209.2), 8.2, 209.1
+9,netssh.c:2724,2724, # distinct matches = 5:
+	493.2, 115.2, 425.1, 237.1, 492.1
 
-9,netssh.c:2725,2725, # distinct matches = 7:
-	7.2, 586.2, 209.2, 409.1, 405.1, 210.1, 444.2 (coincides with 209.2), 8.2, 209.1
+9,netssh.c:2725,2725, # distinct matches = 3:
+	493.2, 115.2, 237.1
 
 9,netssh.c:2726,2726, # distinct matches = 5:
-	7.2, 209.2, 405.1, 210.1, 444.2 (coincides with 209.2), 8.2, 209.1
+	424.1, 427.1, 206.1, 238.1, 237.2, 207.1, 493.2 (coincides with 237.2), 115.2, 237.1
+
+9,netssh.c:2727,2729, # distinct matches = 6:
+	617.2, 424.1, 427.1, 206.1, 238.1, 237.2, 207.1, 493.2 (coincides with 237.2), 115.2, 237.1
+
+9,netssh.c:2730,2730, # distinct matches = 6:
+	617.2, 424.1, 427.1, 238.1, 237.2, 493.2 (coincides with 237.2), 115.2, 237.1
 
-9,netssh.c:2727,2727, # distinct matches = 4:
-	7.2, 209.2, 405.1, 210.1
+9,netssh.c:2731,2731, # distinct matches = 7:
+	114.2, 617.2, 424.1, 427.1, 238.1, 237.2, 493.2 (coincides with 237.2), 115.2, 237.1
 
-9,netssh.c:2728,2728, # distinct matches = 5:
-	443.2, 7.2, 209.2, 405.1, 210.1
+9,netssh.c:2732,2732, # distinct matches = 5:
+	114.2, 424.1, 238.1, 237.2, 493.2 (coincides with 237.2), 115.2, 237.1
 
-9,netssh.c:2729,2729, # distinct matches = 3:
-	443.2, 7.2, 209.2
+9,netssh.c:2733,2733, # distinct matches = 4:
+	114.2, 424.1, 238.1, 237.2
 
-9,netssh.c:2730,2730, # distinct matches = 5:
-	210.2, 408.1, 175.1, 176.1, 404.1, 443.2, 7.2, 209.2 (coincides with 210.2)
+9,netssh.c:2734,2734, # distinct matches = 5:
+	492.2, 114.2, 424.1, 238.1, 237.2
 
-9,netssh.c:2731,2733, # distinct matches = 6:
-	588.2, 210.2, 408.1, 175.1, 176.1, 404.1, 443.2, 7.2, 209.2 (coincides with 210.2)
+9,netssh.c:2735,2735, # distinct matches = 3:
+	492.2, 114.2, 237.2
 
-9,netssh.c:2734,2735, # distinct matches = 5:
-	588.2, 210.2, 408.1, 404.1, 443.2, 7.2, 209.2 (coincides with 210.2)
+9,netssh.c:2736,2736, # distinct matches = 5:
+	211.1, 210.1, 423.1, 238.2, 429.1, 492.2, 114.2, 237.2 (coincides with 238.2)
 
-9,netssh.c:2736,2736, # distinct matches = 6:
-	10.2, 588.2, 210.2, 408.1, 404.1, 443.2, 7.2, 209.2 (coincides with 210.2)
+9,netssh.c:2737,2739, # distinct matches = 6:
+	620.2, 211.1, 210.1, 423.1, 238.2, 429.1, 492.2, 114.2, 237.2 (coincides with 238.2)
 
-9,netssh.c:2737,2737, # distinct matches = 4:
-	10.2, 210.2, 404.1, 443.2, 7.2, 209.2 (coincides with 210.2)
+9,netssh.c:2740,2741, # distinct matches = 5:
+	620.2, 423.1, 238.2, 429.1, 492.2, 114.2, 237.2 (coincides with 238.2)
 
-9,netssh.c:2738,2739, # distinct matches = 3:
-	10.2, 210.2, 404.1, 443.2
+9,netssh.c:2742,2742, # distinct matches = 6:
+	117.2, 620.2, 423.1, 238.2, 429.1, 492.2, 114.2, 237.2 (coincides with 238.2)
 
+9,netssh.c:2743,2743, # distinct matches = 5:
+	117.2, 423.1, 238.2, 492.2, 114.2, 237.2 (coincides with 238.2)
 
-9,netssh.c:2741,2741, # distinct matches = 4:
-	179.2, 404.2 (coincides with 175.2), 173.2 (coincides with 406.2), 177.2 (coincides with 405.2), 406.2, 407.2 (coincides with 179.2), 405.2, 175.2, 404.1
+9,netssh.c:2744,2745, # distinct matches = 4:
+	117.2, 423.1, 238.2, 492.2
 
-9,netssh.c:2742,2744, # distinct matches = 5:
-	589.2, 179.2, 404.2 (coincides with 175.2), 173.2 (coincides with 406.2), 177.2 (coincides with 405.2), 406.2, 407.2 (coincides with 179.2), 405.2, 175.2, 404.1
+9,netssh.c:2746,2746, # distinct matches = 1:
+	423.1
 
-9,netssh.c:2745,2746, # distinct matches = 3:
-	589.2, 404.2 (coincides with 175.2), 406.2, 407.2 (coincides with 179.2), 405.2, 404.1
+9,netssh.c:2747,2747, # distinct matches = 5:
+	426.2, 207.2 (coincides with 424.2), 424.2, 209.2 (coincides with 425.2), 423.2, 425.2, 211.2 (coincides with 423.2), 213.2 (coincides with 426.2), 423.1
 
-9,netssh.c:2747,2747, # distinct matches = 4:
-	9.2, 589.2, 404.2 (coincides with 175.2), 406.2, 407.2 (coincides with 179.2), 405.2, 404.1
+9,netssh.c:2748,2750, # distinct matches = 6:
+	619.2, 426.2, 207.2 (coincides with 424.2), 424.2, 209.2 (coincides with 425.2), 423.2, 425.2, 211.2 (coincides with 423.2), 213.2 (coincides with 426.2), 423.1
 
-9,netssh.c:2748,2748, # distinct matches = 3:
-	9.2, 404.2 (coincides with 175.2), 406.2, 407.2 (coincides with 179.2), 405.2
+9,netssh.c:2751,2752, # distinct matches = 6:
+	619.2, 426.2, 424.2, 423.2, 425.2, 423.1
 
-9,netssh.c:2749,2750, # distinct matches = 3:
-	9.2, 404.2 (coincides with 175.2), 406.2, 405.2
+9,netssh.c:2753,2753, # distinct matches = 7:
+	116.2, 619.2, 426.2, 424.2, 423.2, 425.2, 423.1
 
+9,netssh.c:2754,2754, # distinct matches = 5:
+	116.2, 426.2, 424.2, 423.2, 425.2
 
-9,netssh.c:2752,2752, # distinct matches = 4:
-	178.2 (coincides with 409.2), 408.2, 180.2 (coincides with 411.2), 409.2, 410.2 (coincides with 174.2), 174.2, 411.2, 176.2 (coincides with 408.2), 404.2 (coincides with 175.2)
+9,netssh.c:2755,2756, # distinct matches = 4:
+	116.2, 424.2, 423.2, 425.2
 
-9,netssh.c:2753,2755, # distinct matches = 5:
-	591.2, 178.2 (coincides with 409.2), 408.2, 180.2 (coincides with 411.2), 409.2, 410.2 (coincides with 174.2), 174.2, 411.2, 176.2 (coincides with 408.2), 404.2 (coincides with 175.2)
+9,netssh.c:2757,2757, # distinct matches = 1:
+	423.2
 
-9,netssh.c:2756,2757, # distinct matches = 4:
-	591.2, 408.2, 409.2, 410.2 (coincides with 174.2), 411.2, 404.2 (coincides with 175.2)
+9,netssh.c:2758,2758, # distinct matches = 5:
+	427.2, 428.2 (coincides with 208.2), 429.2 (coincides with 210.2), 430.2 (coincides with 212.2), 208.2, 210.2, 212.2, 206.2 (coincides with 427.2), 423.2
 
-9,netssh.c:2758,2758, # distinct matches = 6:
-	12.2, 14.1, 591.2, 408.2, 409.2, 410.2 (coincides with 174.2), 411.2, 404.2 (coincides with 175.2)
+9,netssh.c:2759,2761, # distinct matches = 6:
+	615.2, 427.2, 428.2 (coincides with 208.2), 429.2 (coincides with 210.2), 430.2 (coincides with 212.2), 208.2, 210.2, 212.2, 206.2 (coincides with 427.2), 423.2
 
-9,netssh.c:2759,2760, # distinct matches = 5:
-	14.2, 13.2, 12.2, 14.1, 591.2
+9,netssh.c:2762,2763, # distinct matches = 3:
+	615.2, 427.2, 428.2 (coincides with 208.2), 429.2 (coincides with 210.2), 430.2 (coincides with 212.2), 423.2
 
-9,netssh.c:2761,2761, # distinct matches = 3:
-	14.2, 13.2, 591.2
+9,netssh.c:2764,2764, # distinct matches = 5:
+	119.1, 118.2, 615.2, 427.2, 428.2 (coincides with 208.2), 429.2 (coincides with 210.2), 430.2 (coincides with 212.2), 423.2
 
-9,netssh.c:2762,2762, # distinct matches = 1:
-	591.2
+9,netssh.c:2765,2766, # distinct matches = 5:
+	121.2, 119.2, 119.1, 118.2, 615.2
 
+9,netssh.c:2767,2767, # distinct matches = 3:
+	121.2, 119.2, 615.2
 
-9,netssh.c:2773,2779, # distinct matches = 1:
-	299.1
+9,netssh.c:2768,2768, # distinct matches = 1:
+	615.2
 
 
-9,netssh.c:2876,2879, # distinct matches = 1:
-	361.1
+9,netssh.c:2779,2785, # distinct matches = 1:
+	344.1
 
-9,netssh.c:2880,2882, # distinct matches = 2:
-	190.1, 361.1
 
+9,netssh.c:2882,2885, # distinct matches = 1:
+	485.1
 
-9,netssh.c:2890,2893, # distinct matches = 1:
-	361.2
+9,netssh.c:2886,2888, # distinct matches = 2:
+	232.1, 485.1
 
-9,netssh.c:2894,2896, # distinct matches = 2:
-	189.1, 361.2
 
+9,netssh.c:2896,2899, # distinct matches = 1:
+	485.2
 
-9,netssh.c:2911,2913, # distinct matches = 2:
-	190.2, 189.2
+9,netssh.c:2900,2902, # distinct matches = 2:
+	233.1, 485.2
 
 
-9,netssh.c:2920,2923, # distinct matches = 1:
-	424.2
+9,netssh.c:2917,2919, # distinct matches = 2:
+	233.2, 232.2
 
 
-9,netssh.c:3073,3077, # distinct matches = 1:
-	299.2
+9,netssh.c:2926,2929, # distinct matches = 1:
+	478.2
 
 
-9,netssh.c:3160,3163, # distinct matches = 3:
-	20.2, 19.2, 23.1
+9,netssh.c:3079,3083, # distinct matches = 1:
+	344.2
 
-9,netssh.c:3164,3167, # distinct matches = 3:
-	23.2, 24.2, 19.2
 
+9,netssh.c:3166,3169, # distinct matches = 3:
+	94.2, 93.1, 91.2
 
-9,netssh.c:3185,3187, # distinct matches = 1:
-	28.1
+9,netssh.c:3170,3173, # distinct matches = 3:
+	93.2, 92.2, 91.2
 
-9,netssh.c:3188,3190, # distinct matches = 2:
-	245.2, 28.1
 
 9,netssh.c:3191,3193, # distinct matches = 1:
-	28.2
+	127.1
 
 9,netssh.c:3194,3196, # distinct matches = 2:
-	244.2, 28.2
+	283.2, 127.1
+
+9,netssh.c:3197,3199, # distinct matches = 1:
+	127.2
+
+9,netssh.c:3200,3202, # distinct matches = 2:
+	282.2, 127.2
 
 
 10,pubkey.c:35,36, # distinct matches = 1:
-	201.1
+	222.1
 
 10,pubkey.c:37,38, # distinct matches = 4:
-	316.1, 315.1, 434.2, 201.1
+	349.1, 483.2, 351.1, 222.1
 
 10,pubkey.c:39,39, # distinct matches = 3:
-	316.1, 315.1, 434.2
+	349.1, 483.2, 351.1
 
 
 10,pubkey.c:49,52, # distinct matches = 1:
-	201.2
+	222.2
 
 
 10,pubkey.c:182,185, # distinct matches = 1:
-	166.1
+	304.1
 
 
 10,pubkey.c:195,198, # distinct matches = 1:
-	166.2
+	304.2
 
 
 10,pubkey.c:217,219, # distinct matches = 3:
-	317.1, 432.2, 316.2
+	351.2, 484.2, 350.1
 
 
 11,rsa2ssh2.c:1,6, # distinct matches = 6:
-	129.2, 131.2, 137.2, 128.2, 123.1, 130.2
+	150.2, 143.2, 136.1, 142.2, 141.2, 144.2
 
 11,rsa2ssh2.c:7,7, # distinct matches = 5:
-	129.2, 131.2, 128.2, 123.1, 130.2
+	143.2, 136.1, 142.2, 141.2, 144.2
 
 11,rsa2ssh2.c:8,8, # distinct matches = 1:
-	123.1
+	136.1
 
 
 11,rsa2ssh2.c:15,17, # distinct matches = 3:
-	365.1, 364.1, 25.2
+	421.1, 27.2, 422.1
 
 11,rsa2ssh2.c:18,19, # distinct matches = 1:
-	25.2
+	27.2
 
 11,rsa2ssh2.c:20,24, # distinct matches = 3:
-	240.1, 513.1, 25.2
+	278.1, 537.1, 27.2
 
 
 12,ssh.c:24,26, # distinct matches = 3:
-	363.1, 365.2, 26.2
+	28.2, 422.2, 420.1
 
 12,ssh.c:27,29, # distinct matches = 1:
-	363.1
+	420.1
 
 12,ssh.c:30,30, # distinct matches = 3:
-	336.1, 517.1, 363.1
+	368.1, 564.1, 420.1
 
 12,ssh.c:31,38, # distinct matches = 2:
-	336.1, 517.1
+	368.1, 564.1
 
 
 12,ssh.c:71,75, # distinct matches = 1:
-	616.1
+	621.1
 
 
 12,ssh.c:80,84, # distinct matches = 2:
-	518.1, 336.2
+	368.2, 565.1
 
 
-12,ssh.c:112,116, # distinct matches = 6:
-	228.1, 230.1, 231.2, 495.2, 489.1, 227.2
+12,ssh.c:112,113, # distinct matches = 7:
+	515.2, 519.1, 267.1, 268.2, 269.1, 270.1, 266.2
 
+12,ssh.c:114,116, # distinct matches = 8:
+	563.2, 515.2, 519.1, 267.1, 268.2, 269.1, 270.1, 266.2
 
-12,ssh.c:148,152, # distinct matches = 2:
-	517.2, 518.2
+12,ssh.c:117,125, # distinct matches = 1:
+	563.2
 
 
-12,ssh.c:163,165, # distinct matches = 1:
-	153.1
+12,ssh.c:150,150, # distinct matches = 1:
+	413.1
 
+12,ssh.c:151,154, # distinct matches = 5:
+	513.2, 269.2, 263.2, 522.1, 413.1
 
-12,ssh.c:167,171, # distinct matches = 1:
-	153.2
 
+12,ssh.c:171,175, # distinct matches = 2:
+	565.2, 564.2
 
-12,ssh.c:218,218, # distinct matches = 7:
-	255.2, 254.2, 251.2, 578.2, 250.2, 248.2, 247.2
 
-12,ssh.c:219,219, # distinct matches = 8:
-	475.1, 255.2, 254.2, 251.2, 578.2, 250.2, 248.2, 247.2
+12,ssh.c:186,188, # distinct matches = 1:
+	415.1
 
-12,ssh.c:220,220, # distinct matches = 14:
-	492.2, 491.2, 490.1, 489.2, 487.2, 488.1, 475.1, 255.2, 254.2, 251.2, 578.2, 250.2, 248.2, 247.2
 
-12,ssh.c:221,221, # distinct matches = 7:
-	492.2, 491.2, 490.1, 489.2, 487.2, 488.1, 475.1
+12,ssh.c:190,194, # distinct matches = 1:
+	415.2
 
-12,ssh.c:222,223, # distinct matches = 6:
-	492.2, 491.2, 490.1, 489.2, 487.2, 488.1
 
+12,ssh.c:241,242, # distinct matches = 7:
+	302.2, 301.2, 300.2, 299.2, 298.2, 297.2, 5.2
 
-12,ssh.c:245,247, # distinct matches = 1:
-	18.1
+12,ssh.c:243,243, # distinct matches = 14:
+	524.1, 520.1, 517.2, 521.2, 522.2, 519.2, 518.2, 302.2, 301.2, 300.2, 299.2, 298.2, 297.2, 5.2
 
+12,ssh.c:244,246, # distinct matches = 7:
+	524.1, 520.1, 517.2, 521.2, 522.2, 519.2, 518.2
 
-12,ssh.c:255,257, # distinct matches = 1:
-	366.1
 
+12,ssh.c:268,270, # distinct matches = 1:
+	26.1
 
-12,ssh.c:259,259, # distinct matches = 4:
-	228.2, 488.2, 226.2, 496.2
 
-12,ssh.c:260,263, # distinct matches = 5:
-	519.1, 228.2, 488.2, 226.2, 496.2
+12,ssh.c:278,280, # distinct matches = 1:
+	176.1
 
-12,ssh.c:264,264, # distinct matches = 1:
-	519.1
+12,ssh.c:281,281, # distinct matches = 1:
+	413.2
 
-12,ssh.c:265,265, # distinct matches = 2:
-	222.2, 519.1
+12,ssh.c:282,282, # distinct matches = 5:
+	262.2, 524.2, 270.2, 523.2, 413.2
 
-12,ssh.c:266,267, # distinct matches = 1:
-	222.2
+12,ssh.c:283,286, # distinct matches = 6:
+	541.1, 262.2, 524.2, 270.2, 523.2, 413.2
 
+12,ssh.c:287,287, # distinct matches = 1:
+	541.1
 
-12,ssh.c:287,289, # distinct matches = 1:
-	18.2
+12,ssh.c:288,288, # distinct matches = 2:
+	200.2, 541.1
 
+12,ssh.c:289,290, # distinct matches = 1:
+	200.2
 
-12,ssh.c:296,299, # distinct matches = 1:
-	366.2
 
+12,ssh.c:310,312, # distinct matches = 1:
+	26.2
 
-12,ssh.c:309,311, # distinct matches = 3:
-	234.2, 233.2, 499.2
 
+12,ssh.c:319,322, # distinct matches = 1:
+	176.2
 
-12,ssh.c:314,322, # distinct matches = 1:
-	519.2
 
+12,ssh.c:332,334, # distinct matches = 3:
+	525.2, 272.2, 271.2
 
-12,ssh.c:369,373, # distinct matches = 1:
-	581.2
 
+12,ssh.c:337,345, # distinct matches = 1:
+	541.2
 
-12,ssh.c:388,392, # distinct matches = 1:
-	616.2
 
+12,ssh.c:392,396, # distinct matches = 1:
+	11.2
 
-12,ssh.c:398,401, # distinct matches = 1:
-	62.1
 
+12,ssh.c:411,415, # distinct matches = 1:
+	621.2
 
-12,ssh.c:417,420, # distinct matches = 1:
-	62.2
 
+12,ssh.c:421,424, # distinct matches = 1:
+	72.1
 
-12,ssh.c:448,448, # distinct matches = 1:
-	475.2
 
-12,ssh.c:449,449, # distinct matches = 5:
-	485.2, 486.2, 481.1, 483.2, 475.2
+12,ssh.c:440,443, # distinct matches = 1:
+	72.2
 
-12,ssh.c:450,450, # distinct matches = 7:
-	513.2, 514.2, 485.2, 486.2, 481.1, 483.2, 475.2
 
-12,ssh.c:451,452, # distinct matches = 6:
-	513.2, 514.2, 485.2, 486.2, 481.1, 483.2
+12,ssh.c:472,472, # distinct matches = 4:
+	259.2, 258.2, 511.2, 260.1
 
-12,ssh.c:453,454, # distinct matches = 2:
-	513.2, 514.2
+12,ssh.c:473,475, # distinct matches = 6:
+	537.2, 538.2, 259.2, 258.2, 511.2, 260.1
 
+12,ssh.c:476,477, # distinct matches = 2:
+	537.2, 538.2
 
-12,ssh.c:466,466, # distinct matches = 1:
-	352.2
 
-12,ssh.c:467,470, # distinct matches = 2:
-	145.1, 352.2
+12,ssh.c:499,499, # distinct matches = 1:
+	419.2
 
+12,ssh.c:500,503, # distinct matches = 2:
+	590.1, 419.2
 
-12,ssh.c:496,498, # distinct matches = 2:
-	564.2, 563.1
+
+12,ssh.c:530,532, # distinct matches = 2:
+	22.2, 21.1
 
 
 13,sshsession.c:26,28, # distinct matches = 3:
-	363.2, 364.2, 27.2
+	420.2, 421.2, 29.2
 
 13,sshsession.c:29,32, # distinct matches = 1:
-	363.2
+	420.2
 
 
 13,sshsession.c:59,66, # distinct matches = 1:
-	90.1
+	111.1
 
 
 13,sshsession.c:79,81, # distinct matches = 1:
-	260.1
+	290.1
 
 
 13,sshsession.c:85,87, # distinct matches = 3:
-	260.2, 258.1, 259.1
+	288.1, 289.1, 290.2
 
 13,sshsession.c:88,88, # distinct matches = 2:
-	258.1, 259.1
+	288.1, 289.1
 
 13,sshsession.c:89,89, # distinct matches = 1:
-	258.1
+	288.1
 
 
 13,sshsession.c:105,112, # distinct matches = 1:
-	90.2
+	111.2
 
 
 13,sshsession.c:117,120, # distinct matches = 3:
-	477.2, 476.2, 223.2
+	505.2, 256.2, 507.2
 
 
 13,sshsession.c:146,146, # distinct matches = 5:
-	553.2, 345.2, 344.2, 552.2, 346.2
+	581.2, 376.2, 578.2, 377.2, 380.2
 
 13,sshsession.c:147,150, # distinct matches = 9:
-	80.2, 75.2, 76.2, 77.2, 553.2, 345.2, 344.2, 552.2, 346.2
+	88.2, 83.2, 76.2, 75.2, 581.2, 376.2, 578.2, 377.2, 380.2
 
 
 13,sshsession.c:171,175, # distinct matches = 1:
-	258.2
+	288.2
 
 
 13,sshsession.c:178,182, # distinct matches = 2:
-	239.2, 240.2
+	278.2, 277.2
 
 
 13,sshsession.c:191,194, # distinct matches = 2:
-	145.2, 144.2
+	589.2, 590.2
 
 
 13,sshsession.c:208,214, # distinct matches = 1:
-	151.2
+	24.2
 
 13,sshsession.c:215,217, # distinct matches = 2:
-	563.2, 151.2
+	21.2, 24.2
 
 13,sshsession.c:218,219, # distinct matches = 1:
-	151.2
+	24.2
 
 
 13,sshsession.c:247,250, # distinct matches = 1:
-	259.2
+	289.2
 
 
 13,sshsession.c:302,305, # distinct matches = 4:
-	490.2, 230.2, 229.2, 494.2
+	520.2, 265.2, 514.2, 267.2
 
 
 13,sshsession.c:328,331, # distinct matches = 3:
-	484.2, 225.2, 481.2
+	260.2, 510.2, 261.2
 
 
 13,sshsession.c:365,368, # distinct matches = 1:
-	185.1
+	218.1
 
 
 13,sshsession.c:373,376, # distinct matches = 1:
-	185.2
+	218.2
 
 
 13,sshsession.c:398,402, # distinct matches = 1:
-	501.1
+	566.1
 
 
 13,sshsession.c:409,410, # distinct matches = 1:
-	442.1
+	495.1
 
 13,sshsession.c:411,411, # distinct matches = 2:
-	501.2, 442.1
+	566.2, 495.1
 
 13,sshsession.c:412,415, # distinct matches = 1:
-	501.2
+	566.2
 
 
 13,sshsession.c:438,438, # distinct matches = 1:
-	442.2
+	495.2
 
 13,sshsession.c:439,440, # distinct matches = 2:
-	423.1, 442.2
+	477.1, 495.2
 
 13,sshsession.c:441,442, # distinct matches = 1:
-	423.1
+	477.1
 
 
 14,transport.c:1,6, # distinct matches = 6:
-	126.2, 125.2, 124.2, 123.2, 136.2, 127.2
+	140.2, 138.2, 137.2, 136.2, 149.2, 139.2
 
 14,transport.c:7,7, # distinct matches = 5:
-	126.2, 125.2, 124.2, 123.2, 127.2
+	140.2, 138.2, 137.2, 136.2, 139.2
 
 14,transport.c:8,8, # distinct matches = 1:
-	123.2
+	136.2
 
 
 14,transport.c:22,26, # distinct matches = 1:
-	512.1
+	534.1
 
 
 14,transport.c:74,76, # distinct matches = 1:
-	169.1
+	203.1
 
 
 14,transport.c:105,108, # distinct matches = 1:
-	423.2
+	477.2
 
 
 14,transport.c:110,112, # distinct matches = 1:
-	169.2
+	203.2
 
 
 14,transport.c:129,134, # distinct matches = 1:
-	187.1
+	221.1
 
 
 14,transport.c:174,183, # distinct matches = 1:
-	187.2
+	221.2
 
 
 14,transport.c:189,191, # distinct matches = 1:
-	108.2
+	128.2
 
 
 14,transport.c:207,209, # distinct matches = 3:
-	315.2, 433.2, 317.2
+	350.2, 482.2, 349.2
 
 
 14,transport.c:214,218, # distinct matches = 1:
-	512.2
+	534.2
 
--- /sys/src/cmd/ssh2/dup.sum	Thu Apr 19 15:20:26 2012
+++ /sys/src/cmd/ssh2/dup.sum	Mon Apr 23 09:10:17 2012
@@ -2,22 +2,22 @@
 Summary:
 Reporting parameterized matches of at least 3 lines.
 15 files
-7163 lines in original code,
-6207 lines after pruning white space and comments.
+7203 lines in original code,
+6239 lines after pruning white space and comments.
 
-2195 lines were involved in 616 matches
-These constitute 35 percent of the ncsl.
-Approximately 1383 lines are redundant,or 22 percent of the ncsl.
+2223 lines were involved in 621 matches
+These constitute 36 percent of the ncsl.
+Approximately 1400 lines are redundant,or 22 percent of the ncsl.
 
 match length: number of matches of that length
-	   3: 266
-	   4: 186
+	   3: 269
+	   4: 187
 	   5:  36
 	   6:  47
 	   7:  22
 	   8:  13
 	   9:  13
-	  10:   5
+	  10:   6
 	  11:   5
 	  12:   3
 	  14:   4
--- /sys/src/cmd/ssh2/dup.xpr	Thu Apr 19 15:20:29 2012
+++ /sys/src/cmd/ssh2/dup.xpr	Mon Apr 23 09:10:17 2012
@@ -6,9 +6,9 @@
       26, 11; 0,cipher3des.c:
       26, 11; 0,cipher3des.c:
 
-36, 28, 5; 1,1
-      61, 48; 1,cipheraes.c:
-      61, 48; 1,cipheraes.c:
+40, 31, 5; 1,1
+      70, 55; 1,cipheraes.c:
+      70, 55; 1,cipheraes.c:
 
 7, 4, 1; 2,2
       13, 8; 2,cipherblowfish.c:
@@ -30,17 +30,17 @@
       8, 34; 7,dial.thread.c:
       8, 34; 7,dial.thread.c:
 
-22, 641, 316; 9,9
-      34, 992; 9,netssh.c:
-      34, 992; 9,netssh.c:
+22, 643, 316; 9,9
+      34, 994; 9,netssh.c:
+      34, 994; 9,netssh.c:
 
 5, 10, 3; 10,10
       10, 20; 10,pubkey.c:
       10, 20; 10,pubkey.c:
 
-8, 37, 13; 12,12
-      14, 67; 12,ssh.c:
-      14, 67; 12,ssh.c:
+8, 39, 15; 12,12
+      13, 68; 12,ssh.c:
+      13, 68; 12,ssh.c:
 
 7, 28, 7; 13,13
       13, 54; 13,sshsession.c:
@@ -83,7 +83,7 @@
       1, 7; 12,ssh.c:
 
 2, 22, 6; 12,13
-      5, 23; 12,ssh.c:
+      4, 23; 12,ssh.c:
       5, 20; 13,sshsession.c:
 
 0, 3, 1; 13,14
@@ -122,9 +122,9 @@
       4, 19; 6,dial.c:
       1, 17; 9,netssh.c:
 
-2, 51, 22; 9,12
+2, 53, 23; 9,12
       2, 58; 9,netssh.c:
-      8, 37; 12,ssh.c:
+      8, 40; 12,ssh.c:
 
 3, 8, 1; 11,14
       13, 8; 11,rsa2ssh2.c:
@@ -170,9 +170,9 @@
       8, 6; 1,cipheraes.c:
       1, 6; 7,dial.thread.c:
 
-1, 6, 3; 6,12
-      1, 3; 6,dial.c:
-      2, 9; 12,ssh.c:
+2, 17, 5; 6,12
+      3, 13; 6,dial.c:
+      4, 20; 12,ssh.c:
 
 1, 9, 3; 7,13
       2, 10; 7,dial.thread.c:
--- /sys/src/cmd/ssh2/long.funcs	Thu Apr 19 15:20:30 2012
+++ /sys/src/cmd/ssh2/long.funcs	Mon Apr 23 09:10:17 2012
@@ -1,79 +1,79 @@
-193	netssh.c:2233,2426	established()
-187	netssh.c:1066,1253	writectlproc()
+193	netssh.c:2239,2432	established()
+187	netssh.c:1071,1258	writectlproc()
 153	dh.c:51,204	dh_init()
-143	netssh.c:730,873	readreqrem()
-134	netssh.c:2078,2212	negotiating()
-125	netssh.c:601,726	stread()
-111	netssh.c:2444,2555	reader0()
-103	netssh.c:1257,1360	writereqremproc()
+143	netssh.c:735,878	readreqrem()
+134	netssh.c:2084,2218	negotiating()
+125	netssh.c:606,731	stread()
+111	netssh.c:2450,2561	reader0()
+104	netssh.c:1262,1366	writereqremproc()
 98	sshsession.c:182,280	main()
 98	dh.c:453,551	dh_server()
-98	netssh.c:1899,1997	dohandshake()
-95	netssh.c:2586,2681	validatekexs()
+98	netssh.c:1905,2003	dohandshake()
+96	ssh.c:477,573	main()
+95	netssh.c:2592,2687	validatekexs()
 94	dh.c:808,902	genkeys()
-93	netssh.c:3117,3210	shutdown()
+93	netssh.c:3123,3216	shutdown()
 92	dh.c:676,768	dh_client12()
-88	netssh.c:1408,1496	stclunk()
+88	netssh.c:1414,1502	stclunk()
 85	dial.c:337,422	csdial()
-85	ssh.c:454,539	main()
 84	dial.thread.c:337,421	csdial()
-82	netssh.c:1538,1620	alloc_conn()
-81	netssh.c:396,477	stlisconn()
-79	netssh.c:2685,2764	validatekexc()
+82	netssh.c:1544,1626	alloc_conn()
+81	netssh.c:401,482	stlisconn()
+79	netssh.c:2691,2770	validatekexc()
 76	dial.c:426,502	call()
-75	netssh.c:2999,3074	client_auth()
-74	netssh.c:988,1062	userauth()
-71	netssh.c:481,552	stlischan()
-70	netssh.c:2925,2995	auth_req()
+75	netssh.c:3005,3080	client_auth()
+74	netssh.c:993,1067	userauth()
+71	netssh.c:486,557	stlischan()
+70	netssh.c:2931,3001	auth_req()
 70	dial.thread.c:426,496	call()
 65	dh.c:306,371	rsa_verify()
 65	sshsession.c:333,398	newchannel()
-65	netssh.c:1624,1689	alloc_chan()
-65	netssh.c:317,382	stopen()
-64	netssh.c:2001,2065	send_kexinit()
+65	netssh.c:1630,1695	alloc_chan()
+65	netssh.c:322,387	stopen()
+64	netssh.c:2007,2071	send_kexinit()
 62	pubkey.c:142,204	replacekey()
-58	netssh.c:2863,2921	authreqpk()
+58	netssh.c:2869,2927	authreqpk()
 53	sshsession.c:444,497	runcmd()
-51	ssh.c:322,373	bidircopy()
+51	ssh.c:345,396	bidircopy()
 50	dh.c:247,297	rsa_sign()
 50	dh.c:622,672	verifyhostkey()
-49	ssh.c:265,314	keyproc()
+49	ssh.c:288,337	keyproc()
 48	pubkey.c:17,65	parsepubkey()
-47	netssh.c:877,924	readdata()
-45	netssh.c:928,973	stwrite()
-45	netssh.c:168,213	threadmain()
+47	netssh.c:882,929	readdata()
+46	netssh.c:168,214	threadmain()
+45	netssh.c:933,978	stwrite()
 42	rsa2ssh2.c:24,66	main()
-41	netssh.c:556,597	getdata()
+41	netssh.c:561,602	getdata()
 41	transport.c:133,174	finish_packet()
-40	ssh.c:181,221	cmdmode()
-38	dh.c:391,429	dss_sign()
+40	ssh.c:204,244	cmdmode()
 38	dh.c:580,618	findkeyinuserring()
-35	dial.thread.c:93,128	dialimpl()
-35	ssh.c:225,260	keyprompt()
+38	dh.c:391,429	dss_sign()
+35	ssh.c:248,283	keyprompt()
 35	dial.c:77,112	dialimpl()
-34	ssh.c:553,587	doauth()
-34	netssh.c:1364,1398	writedataproc()
-34	netssh.c:3079,3113	factlookup()
+35	dial.thread.c:93,128	dialimpl()
+34	netssh.c:3085,3119	factlookup()
+34	netssh.c:1370,1404	writedataproc()
+34	ssh.c:587,621	doauth()
+33	netssh.c:274,307	server()
+32	netssh.c:2824,2856	keyfsauth()
 32	dial.thread.c:243,275	recvresults()
 32	transport.c:182,214	undo_packet()
-32	netssh.c:2818,2850	keyfsauth()
-31	netssh.c:1772,1803	exchids()
-30	dial.c:303,333	dialmulti()
+31	netssh.c:1778,1809	exchids()
 30	dial.thread.c:284,314	dialmulti()
-30	netssh.c:2781,2811	mkcap()
+30	netssh.c:2787,2817	mkcap()
+30	dial.c:303,333	dialmulti()
 30	ssh.c:84,114	parseargs()
-29	netssh.c:273,302	server()
 29	dial.thread.c:199,228	callproc()
 28	dial.c:531,559	_dial_string_parse()
 28	dial.thread.c:525,553	_dial_string_parse()
-27	netssh.c:235,262	read9pmsg()
-27	netssh.c:1867,1894	dohandshake()
+27	netssh.c:1842,1869	deferredinit()
+27	netssh.c:236,263	read9pmsg()
+27	netssh.c:1873,1900	dohandshake()
 27	cipherblowfish.c:16,43	initblowfish()
-27	netssh.c:1836,1863	deferredinit()
 26	sshsession.c:152,178	listenloop()
-26	pubkey.c:112,138	findkey()
-26	ssh.c:424,450	remotecmd()
+26	ssh.c:447,473	remotecmd()
 26	sshsession.c:122,148	authnewns()
+26	pubkey.c:112,138	findkey()
+25	netssh.c:1506,1531	stflush()
 25	sshsession.c:415,440	confine()
-25	netssh.c:1500,1525	stflush()
-25	ssh.c:152,177	starttunnel()
+25	ssh.c:175,200	starttunnel()
--- /sys/src/cmd/ssh2/magic.out	Thu Apr 19 15:20:32 2012
+++ /sys/src/cmd/ssh2/magic.out	Mon Apr 23 09:10:17 2012
@@ -91,135 +91,135 @@
 netssh.c:71: char uid[32];
 netssh.c:173: case '9':
 netssh.c:205: keymbox.mchan = chancreate(4, 0);
-netssh.c:254: werrstr("bad length in 9P2000 message header");
-netssh.c:278: netsshsrv.tree = alloctree(uid, uid, 0777, nil);
-netssh.c:279: rootfile = createfile(netsshsrv.tree->root, "ssh", uid, 0555|DMDIR,
-netssh.c:281: clonefile = createfile(rootfile, "clone", uid, 0666, (void*)Qclone);
-netssh.c:282: ctlfile = createfile(rootfile, "ctl", uid, 0666, (void*)Qctl);
-netssh.c:283: keysfile = createfile(rootfile, "keys", uid, 0600, (void *)Qreqrem);
-netssh.c:296: d.mode = 0666;
-netssh.c:321: char buf[32];
-netssh.c:338: /* should use dial(2) instead of diddling /net/tcp */
-netssh.c:446: /* should use dial(2) instead of diddling /net/tcp */
-netssh.c:532: hnputl(p2->payload + 5, c->chans[i]->id);
-netssh.c:533: hnputl(p2->payload + 9, Maxpayload);
-netssh.c:534: hnputl(p2->payload + 13, Maxrpcbuf);
-netssh.c:535: p2->rlength = 18;
-netssh.c:582: if (sc->rwindow < 16*1024) {		/* magic.  half-way, maybe? */
-netssh.c:589: hnputl(p->payload+5, Maxpayload);
-netssh.c:590: p->rlength += 8;
-netssh.c:682: n = pread(c->ctlfd, buf, 10, 0); // magic 10
-netssh.c:716: n = pread(c->ctlfd, buf, 10, 0); /* magic 10 */
-netssh.c:804: n = ioread(io, c->ctlfd, buf, 10); /* magic 10 */
-netssh.c:980: * should use dial(2) instead of doing it by hand.
-netssh.c:982: sshdebug(c, "tcp connect %s %s", toks[1], ntok > 3? toks[2]: "");
-netssh.c:983: return fprint(c->ctlfd, "connect %s %s", toks[1], ntok > 3? toks[2]: "");
-netssh.c:990: char *attrs[5];
-netssh.c:993: if (ntok < 3 || ntok > 4)
-netssh.c:999: c->user = estrdup9p(toks[2]);
-netssh.c:1002: if (ntok == 4 && strcmp(toks[1], "k") == 0) {
-netssh.c:1009: c->password = estrdup9p(toks[3]);
-netssh.c:1019: attrs[2] = smprint("user=%s", c->user);
-netssh.c:1020: attrs[3] = smprint("sys=%s", c->remote);
-netssh.c:1024: if (ntok == 3)
-netssh.c:1025: c->authkey = factlookup(4, 2, attrs);
-netssh.c:1027: attrs[4] = toks[3];
-netssh.c:1028: c->authkey = factlookup(5, 2, attrs);
-netssh.c:1030: free(attrs[2]);
-netssh.c:1031: free(attrs[3]);
-netssh.c:1071: char *tcpconn2, *buf, *toks[4];
-netssh.c:1102: if (ntok < 2)
-netssh.c:1109: if (ntok < 2)
-netssh.c:1112: * should use dial(2) instead of doing it by hand.
-netssh.c:1122: pkas[2] = nil;
-netssh.c:1152: /* should use dial(2) instead of diddling /net/tcp */
-netssh.c:1178: add_string(p, toks[2]);
-netssh.c:1185: fprint(c->ctlfd, "reject %s %s", buf, toks[2]);
-netssh.c:1262: char *cmd, *q, *buf, *toks[4];
-netssh.c:1277: if (r->ifcall.count <= 10)
-netssh.c:1278: buf = emalloc9p(10 + 1);
-netssh.c:1347: for (n = 2; n < ntok; ++n) {
-netssh.c:1386: p->rlength += 4;
-netssh.c:1403: * called clunk.  But if there are no other references, a 9P Tclunk
-netssh.c:1475: p->rlength += 4;
-netssh.c:1594: c->dir = createfile(rootfile, buf, uid, 0555|DMDIR,
-netssh.c:1596: c->clonefile = createfile(c->dir, "clone", uid, 0666,
-netssh.c:1598: c->ctlfile = createfile(c->dir, "ctl", uid, 0666,
-netssh.c:1600: c->datafile = createfile(c->dir, "data", uid, 0666,
-netssh.c:1602: c->listenfile = createfile(c->dir, "listen", uid, 0666,
-netssh.c:1604: c->localfile = createfile(c->dir, "local", uid, 0444,
-netssh.c:1606: c->remotefile = createfile(c->dir, "remote", uid, 0444,
-netssh.c:1608: c->statusfile = createfile(c->dir, "status", uid, 0444,
-netssh.c:1610: c->tcpfile = createfile(c->dir, "tcp", uid, 0444,
-netssh.c:1652: sc->dir = createfile(c->dir, buf, uid, 0555|DMDIR,
-netssh.c:1654: sc->ctl = createfile(sc->dir, "ctl", uid, 0666,
-netssh.c:1656: sc->data = createfile(sc->dir, "data", uid, 0666,
-netssh.c:1658: sc->listen = createfile(sc->dir, "listen", uid, 0666,
-netssh.c:1660: sc->request = createfile(sc->dir, "request", uid, 0666,
-netssh.c:1662: sc->status = createfile(sc->dir, "status", uid, 0444,
-netssh.c:1664: sc->tcp = createfile(sc->dir, "tcp", uid, 0444,
-netssh.c:1679: sc->inchan = chancreate(4, 0);
-netssh.c:1683: sc->reqchan = chancreate(4, 0);
-netssh.c:1783: if (n < 5)		/* can't be a valid SSH id string */
-netssh.c:1790: if (n < 5)		/* can't be a valid SSH id string */
-netssh.c:1846: 0 && c->role == Client && strncmp(remid, "SSH-2", 5) != 0 &&
-netssh.c:1847: strncmp(remid, "SSH-1.99", 8) != 0) {
-netssh.c:1944: if (n < 5) {		/* can't be a valid SSH id string */
-netssh.c:1952: strncmp(path, "SSH-2", 5) != 0 &&
-netssh.c:1953: strncmp(path, "SSH-1.99", 8) != 0) {
-netssh.c:1990: /* should use hangup in dial(2) instead of diddling /net/tcp */
-netssh.c:1993: iowrite(io, fd, "hangup", 6);
-netssh.c:2015: for (i = 0; i < 16; ++i)
-netssh.c:2018: add_packet(c->skexinit, buf, 16);		/* cookie */
-netssh.c:2054: memset(buf, 0, 5);
-netssh.c:2055: add_packet(c->skexinit, buf, 5);
-netssh.c:2085: get_string(p, p->payload + 5, buf, Arbbufsz, nil);
-netssh.c:2095: memmove(c->c2siv, c->nc2siv, SHA1dlen*2);
-netssh.c:2096: memmove(c->s2civ, c->ns2civ, SHA1dlen*2);
-netssh.c:2097: memmove(c->c2sek, c->nc2sek, SHA1dlen*2);
-netssh.c:2098: memmove(c->s2cek, c->ns2cek, SHA1dlen*2);
-netssh.c:2099: memmove(c->c2sik, c->nc2sik, SHA1dlen*2);
-netssh.c:2100: memmove(c->s2cik, c->ns2cik, SHA1dlen*2);
-netssh.c:2222: add_block(p2, p->payload + 5, 4);
-netssh.c:2223: hnputl(p2->payload + p2->rlength - 1, 4);
-netssh.c:2224: p2->rlength += 4;
-netssh.c:2247: get_string(p, p->payload + 5, buf, Arbbufsz, nil);
-netssh.c:2256: get_string(p, p->payload + 2, buf, Arbbufsz, nil);
-netssh.c:2290: ch->twindow = nhgetl(q+4);
-netssh.c:2316: ch->otherid = nhgetl(p->payload+5);
-netssh.c:2317: ch->twindow = nhgetl(p->payload+9);
-netssh.c:2331: ch->twindow += nhgetl(p->payload + 5);
-netssh.c:2345: pl->rem = nhgetl(p->payload + 5);
-netssh.c:2346: pl->st = pl->pack->payload + 9;
-netssh.c:2348: pl->rem = nhgetl(p->payload + 9);
-netssh.c:2349: pl->st = pl->pack->payload + 13;
-netssh.c:2377: p2->rlength += 4;
-netssh.c:2402: q = get_string(p, p->payload+5, buf, Arbbufsz, nil);
-netssh.c:2409: memmove(pl->pack->payload + n, q + 1, p->rlength - (11 + (n-2)));
-netssh.c:2410: pl->rem = p->rlength - 11 + 2;
-netssh.c:2449: nb = 4;
-netssh.c:2468: np = ioreadn(c->rio, c->datafd, p->nlength + nb, p->rlength + 4 - nb);
-netssh.c:2470: nm = ioreadn(c->rio, c->datafd, p->nlength + p->rlength + 4,
-netssh.c:2471: SHA1dlen);		/* SHA1dlen was magic 20 */
-netssh.c:2485: /* SHA1dlen was magic 20 */
-netssh.c:2486: if (np != p->rlength + 4 - nb || c->inmac != -1 && nm != SHA1dlen) {
-netssh.c:2491: p->rlength = n - 4;
-netssh.c:2522: get_string(p, p->payload + 5, buf, Arbbufsz, nil);
-netssh.c:2533: case -2:
-netssh.c:2593: q = p->payload + 17;
-netssh.c:2692: q = p->payload + 17;
-netssh.c:2792: cap = emalloc9p(fromtosz + sizeof(rand)*3 + 1);
-netssh.c:2793: snprint(cap, fromtosz + sizeof(rand)*3 + 1, "%s@%s", from, to);
-netssh.c:2796: enc64(key, sizeof(rand)*3, rand, sizeof(rand));
-netssh.c:2839: werrstr("Password mismatch 2");
-netssh.c:2865: char method[32];
-netssh.c:2928: char key1[DESKEYLEN], key2[DESKEYLEN], method[32];
-netssh.c:3032: ek = strtomp(r+4, nil, 16, nil);
-netssh.c:3033: nk = strtomp(s+3, nil, 16, nil);
-netssh.c:3124: if (c->clonefile->ref <= 2 && c->ctlfile->ref <= 2 &&
-netssh.c:3125: c->datafile->ref <= 2 && c->listenfile->ref <= 2 &&
-netssh.c:3126: c->localfile->ref <= 2 && c->remotefile->ref <= 2 &&
-netssh.c:3127: c->statusfile->ref <= 2)
+netssh.c:255: werrstr("bad length in 9P2000 message header");
+netssh.c:279: netsshsrv.tree = alloctree(uid, uid, 0777, nil);
+netssh.c:280: rootfile = createfile(netsshsrv.tree->root, "ssh", uid, 0555|DMDIR,
+netssh.c:282: clonefile = createfile(rootfile, "clone", uid, 0666, (void*)Qclone);
+netssh.c:283: ctlfile = createfile(rootfile, "ctl", uid, 0666, (void*)Qctl);
+netssh.c:284: keysfile = createfile(rootfile, "keys", uid, 0600, (void *)Qreqrem);
+netssh.c:301: d.mode = 0666;
+netssh.c:326: char buf[32];
+netssh.c:343: /* should use dial(2) instead of diddling /net/tcp */
+netssh.c:451: /* should use dial(2) instead of diddling /net/tcp */
+netssh.c:537: hnputl(p2->payload + 5, c->chans[i]->id);
+netssh.c:538: hnputl(p2->payload + 9, Maxpayload);
+netssh.c:539: hnputl(p2->payload + 13, Maxrpcbuf);
+netssh.c:540: p2->rlength = 18;
+netssh.c:587: if (sc->rwindow < 16*1024) {		/* magic.  half-way, maybe? */
+netssh.c:594: hnputl(p->payload+5, Maxpayload);
+netssh.c:595: p->rlength += 8;
+netssh.c:687: n = pread(c->ctlfd, buf, 10, 0); // magic 10
+netssh.c:721: n = pread(c->ctlfd, buf, 10, 0); /* magic 10 */
+netssh.c:809: n = ioread(io, c->ctlfd, buf, 10); /* magic 10 */
+netssh.c:985: * should use dial(2) instead of doing it by hand.
+netssh.c:987: sshdebug(c, "tcp connect %s %s", toks[1], ntok > 3? toks[2]: "");
+netssh.c:988: return fprint(c->ctlfd, "connect %s %s", toks[1], ntok > 3? toks[2]: "");
+netssh.c:995: char *attrs[5];
+netssh.c:998: if (ntok < 3 || ntok > 4)
+netssh.c:1004: c->user = estrdup9p(toks[2]);
+netssh.c:1007: if (ntok == 4 && strcmp(toks[1], "k") == 0) {
+netssh.c:1014: c->password = estrdup9p(toks[3]);
+netssh.c:1024: attrs[2] = smprint("user=%s", c->user);
+netssh.c:1025: attrs[3] = smprint("sys=%s", c->remote);
+netssh.c:1029: if (ntok == 3)
+netssh.c:1030: c->authkey = factlookup(4, 2, attrs);
+netssh.c:1032: attrs[4] = toks[3];
+netssh.c:1033: c->authkey = factlookup(5, 2, attrs);
+netssh.c:1035: free(attrs[2]);
+netssh.c:1036: free(attrs[3]);
+netssh.c:1076: char *tcpconn2, *buf, *toks[4];
+netssh.c:1107: if (ntok < 2)
+netssh.c:1114: if (ntok < 2)
+netssh.c:1117: * should use dial(2) instead of doing it by hand.
+netssh.c:1127: pkas[2] = nil;
+netssh.c:1157: /* should use dial(2) instead of diddling /net/tcp */
+netssh.c:1183: add_string(p, toks[2]);
+netssh.c:1190: fprint(c->ctlfd, "reject %s %s", buf, toks[2]);
+netssh.c:1267: char *cmd, *q, *buf, *toks[4];
+netssh.c:1282: if (r->ifcall.count <= 10)
+netssh.c:1283: buf = emalloc9p(10 + 1);
+netssh.c:1353: for (n = 2; n < ntok; ++n) {
+netssh.c:1392: p->rlength += 4;
+netssh.c:1409: * called clunk.  But if there are no other references, a 9P Tclunk
+netssh.c:1481: p->rlength += 4;
+netssh.c:1600: c->dir = createfile(rootfile, buf, uid, 0555|DMDIR,
+netssh.c:1602: c->clonefile = createfile(c->dir, "clone", uid, 0666,
+netssh.c:1604: c->ctlfile = createfile(c->dir, "ctl", uid, 0666,
+netssh.c:1606: c->datafile = createfile(c->dir, "data", uid, 0666,
+netssh.c:1608: c->listenfile = createfile(c->dir, "listen", uid, 0666,
+netssh.c:1610: c->localfile = createfile(c->dir, "local", uid, 0444,
+netssh.c:1612: c->remotefile = createfile(c->dir, "remote", uid, 0444,
+netssh.c:1614: c->statusfile = createfile(c->dir, "status", uid, 0444,
+netssh.c:1616: c->tcpfile = createfile(c->dir, "tcp", uid, 0444,
+netssh.c:1658: sc->dir = createfile(c->dir, buf, uid, 0555|DMDIR,
+netssh.c:1660: sc->ctl = createfile(sc->dir, "ctl", uid, 0666,
+netssh.c:1662: sc->data = createfile(sc->dir, "data", uid, 0666,
+netssh.c:1664: sc->listen = createfile(sc->dir, "listen", uid, 0666,
+netssh.c:1666: sc->request = createfile(sc->dir, "request", uid, 0666,
+netssh.c:1668: sc->status = createfile(sc->dir, "status", uid, 0444,
+netssh.c:1670: sc->tcp = createfile(sc->dir, "tcp", uid, 0444,
+netssh.c:1685: sc->inchan = chancreate(4, 0);
+netssh.c:1689: sc->reqchan = chancreate(4, 0);
+netssh.c:1789: if (n < 5)		/* can't be a valid SSH id string */
+netssh.c:1796: if (n < 5)		/* can't be a valid SSH id string */
+netssh.c:1852: 0 && c->role == Client && strncmp(remid, "SSH-2", 5) != 0 &&
+netssh.c:1853: strncmp(remid, "SSH-1.99", 8) != 0) {
+netssh.c:1950: if (n < 5) {		/* can't be a valid SSH id string */
+netssh.c:1958: strncmp(path, "SSH-2", 5) != 0 &&
+netssh.c:1959: strncmp(path, "SSH-1.99", 8) != 0) {
+netssh.c:1996: /* should use hangup in dial(2) instead of diddling /net/tcp */
+netssh.c:1999: iowrite(io, fd, "hangup", 6);
+netssh.c:2021: for (i = 0; i < 16; ++i)
+netssh.c:2024: add_packet(c->skexinit, buf, 16);		/* cookie */
+netssh.c:2060: memset(buf, 0, 5);
+netssh.c:2061: add_packet(c->skexinit, buf, 5);
+netssh.c:2091: get_string(p, p->payload + 5, buf, Arbbufsz, nil);
+netssh.c:2101: memmove(c->c2siv, c->nc2siv, SHA1dlen*2);
+netssh.c:2102: memmove(c->s2civ, c->ns2civ, SHA1dlen*2);
+netssh.c:2103: memmove(c->c2sek, c->nc2sek, SHA1dlen*2);
+netssh.c:2104: memmove(c->s2cek, c->ns2cek, SHA1dlen*2);
+netssh.c:2105: memmove(c->c2sik, c->nc2sik, SHA1dlen*2);
+netssh.c:2106: memmove(c->s2cik, c->ns2cik, SHA1dlen*2);
+netssh.c:2228: add_block(p2, p->payload + 5, 4);
+netssh.c:2229: hnputl(p2->payload + p2->rlength - 1, 4);
+netssh.c:2230: p2->rlength += 4;
+netssh.c:2253: get_string(p, p->payload + 5, buf, Arbbufsz, nil);
+netssh.c:2262: get_string(p, p->payload + 2, buf, Arbbufsz, nil);
+netssh.c:2296: ch->twindow = nhgetl(q+4);
+netssh.c:2322: ch->otherid = nhgetl(p->payload+5);
+netssh.c:2323: ch->twindow = nhgetl(p->payload+9);
+netssh.c:2337: ch->twindow += nhgetl(p->payload + 5);
+netssh.c:2351: pl->rem = nhgetl(p->payload + 5);
+netssh.c:2352: pl->st = pl->pack->payload + 9;
+netssh.c:2354: pl->rem = nhgetl(p->payload + 9);
+netssh.c:2355: pl->st = pl->pack->payload + 13;
+netssh.c:2383: p2->rlength += 4;
+netssh.c:2408: q = get_string(p, p->payload+5, buf, Arbbufsz, nil);
+netssh.c:2415: memmove(pl->pack->payload + n, q + 1, p->rlength - (11 + n-2));
+netssh.c:2416: pl->rem = p->rlength - 11 + 2;
+netssh.c:2455: nb = 4;
+netssh.c:2474: np = ioreadn(c->rio, c->datafd, p->nlength + nb, p->rlength + 4 - nb);
+netssh.c:2476: nm = ioreadn(c->rio, c->datafd, p->nlength + p->rlength + 4,
+netssh.c:2477: SHA1dlen);		/* SHA1dlen was magic 20 */
+netssh.c:2491: /* SHA1dlen was magic 20 */
+netssh.c:2492: if (np != p->rlength + 4 - nb || c->inmac != -1 && nm != SHA1dlen) {
+netssh.c:2497: p->rlength = n - 4;
+netssh.c:2528: get_string(p, p->payload + 5, buf, Arbbufsz, nil);
+netssh.c:2539: case -2:
+netssh.c:2599: q = p->payload + 17;
+netssh.c:2698: q = p->payload + 17;
+netssh.c:2798: cap = emalloc9p(fromtosz + sizeof(rand)*3 + 1);
+netssh.c:2799: snprint(cap, fromtosz + sizeof(rand)*3 + 1, "%s@%s", from, to);
+netssh.c:2802: enc64(key, sizeof(rand)*3, rand, sizeof(rand));
+netssh.c:2845: werrstr("Password mismatch 2");
+netssh.c:2871: char method[32];
+netssh.c:2934: char key1[DESKEYLEN], key2[DESKEYLEN], method[32];
+netssh.c:3038: ek = strtomp(r+4, nil, 16, nil);
+netssh.c:3039: nk = strtomp(s+3, nil, 16, nil);
+netssh.c:3130: if (c->clonefile->ref <= 2 && c->ctlfile->ref <= 2 &&
+netssh.c:3131: c->datafile->ref <= 2 && c->listenfile->ref <= 2 &&
+netssh.c:3132: c->localfile->ref <= 2 && c->remotefile->ref <= 2 &&
+netssh.c:3133: c->statusfile->ref <= 2)
 pubkey.c:12: Arbsz =	256,
 pubkey.c:22: n = strtoul(s, &p, 10);
 pubkey.c:33: n = strtoul(s, &p, 10);
@@ -233,27 +233,28 @@
 rsa2ssh2.c:54: e = strtomp(ep+4, nil, 16, nil);
 rsa2ssh2.c:55: n = strtomp(np+3, nil, 16, nil);
 rsa2ssh2.c:61: sysfatal("base-64 encoding failed\n");
-ssh.c:140: //		for (fd = 3; fd < 40; fd++)
-ssh.c:196: if (buf[n-1] == ('u' & 037))
-ssh.c:228: write(kconsfd, buf+5, n);
-ssh.c:234: write(kconsfd, buf+5, n);
-ssh.c:242: seek(keyfd, 0, 2);
-ssh.c:243: if (readn(keyfd, buf, 5) <= 0)
-ssh.c:245: buf[5] = 0;
-ssh.c:246: n = strtol(buf+1, nil, 10);
-ssh.c:247: n = readn(keyfd, buf+5, n);
-ssh.c:250: buf[n+5] = 0;
-ssh.c:255: fprint(kconsfd, "%s\n", buf+5);
-ssh.c:269: if (size < 6)
-ssh.c:284: n = read(keyfd, buf, 5);		/* reading /net/ssh/keys */
-ssh.c:287: buf[5] = 0;
-ssh.c:288: n = strtol(buf+1, nil, 10);
-ssh.c:289: n = readn(keyfd, buf+5, n);
-ssh.c:290: buf[n+5] = 0;
-ssh.c:296: fprint(kconsfd, "%s\n", buf+5);
-ssh.c:382: ds = netmkaddr(remote, dir, "22");		/* tcp port 22 is ssh */
-ssh.c:544: char buf[64];
-ssh.c:548: return strlen(buf) >= 9 && strcmp(buf+strlen(buf)-9, "/dev/cons") == 0;
+ssh.c:131: oalarm = alarm(5*1000);		/* don't get stuck here */
+ssh.c:163: //		for (fd = 3; fd < 40; fd++)
+ssh.c:219: if (buf[n-1] == ('u' & 037))
+ssh.c:251: write(kconsfd, buf+5, n);
+ssh.c:257: write(kconsfd, buf+5, n);
+ssh.c:265: seek(keyfd, 0, 2);
+ssh.c:266: if (readn(keyfd, buf, 5) <= 0)
+ssh.c:268: buf[5] = 0;
+ssh.c:269: n = strtol(buf+1, nil, 10);
+ssh.c:270: n = readn(keyfd, buf+5, n);
+ssh.c:273: buf[n+5] = 0;
+ssh.c:278: fprint(kconsfd, "%s\n", buf+5);
+ssh.c:292: if (size < 6)
+ssh.c:307: n = read(keyfd, buf, 5);		/* reading /net/ssh/keys */
+ssh.c:310: buf[5] = 0;
+ssh.c:311: n = strtol(buf+1, nil, 10);
+ssh.c:312: n = readn(keyfd, buf+5, n);
+ssh.c:313: buf[n+5] = 0;
+ssh.c:319: fprint(kconsfd, "%s\n", buf+5);
+ssh.c:405: ds = netmkaddr(remote, dir, "22");		/* tcp port 22 is ssh */
+ssh.c:578: char buf[64];
+ssh.c:582: return strlen(buf) >= 9 && strcmp(buf+strlen(buf)-9, "/dev/cons") == 0;
 sshsession.c:223: errfd = 2;
 sshsession.c:406: q += 4;
 sshsession.c:420: q += 4;
--- /sys/src/cmd/ssh2/netssh.c	Thu Apr 19 15:20:34 2012
+++ /sys/src/cmd/ssh2/netssh.c	Mon Apr 23 09:10:17 2012
@@ -210,6 +210,7 @@
 	if (rfork(RFNOTEG) < 0)
 		fprint(2, "%s: rfork(NOTEG) failed: %r\n", argv0);
 	server(mntpt, srvpt);
+	threadexits(nil);
 }
 
 int
@@ -282,7 +283,11 @@
 	ctlfile = createfile(rootfile, "ctl", uid, 0666, (void*)Qctl);
 	keysfile = createfile(rootfile, "keys", uid, 0600, (void *)Qreqrem);
 
-	threadpostmountsrv(&netsshsrv, srvpt, mntpt, MAFTER);
+	/*
+	 * needs to be MBEFORE in case there are previous, now defunct,
+	 * netssh processes mounted in mntpt.
+	 */
+	threadpostmountsrv(&netsshsrv, srvpt, mntpt, MBEFORE);
 
 	p = esmprint("%s/cs", mntpt);
 	fd = open(p, OWRITE);
--- /sys/src/cmd/ssh2/ssh.c	Thu Apr 19 15:20:37 2012
+++ /sys/src/cmd/ssh2/ssh.c	Mon Apr 23 09:10:17 2012
@@ -114,6 +114,27 @@
 }
 
 static void
+catcher(void *, char *s)
+{
+	if (strstr(s, "alarm") != nil)
+		noted(NCONT);
+	else
+		noted(NDFLT);
+}
+
+static int
+timedmount(int fd, int afd, char *mntpt, int flag, char *aname)
+{
+	int oalarm, ret;
+
+	notify(catcher);
+	oalarm = alarm(5*1000);		/* don't get stuck here */
+	ret = mount(fd, afd, mntpt, flag, aname);
+	alarm(oalarm);
+	return ret;
+}
+
+static void
 mounttunnel(char *srv)
 {
 	int fd;
@@ -124,8 +145,10 @@
 	if (fd < 0) {
 		if (debug)
 			fprint(2, "%s: can't open %s: %r\n", argv0, srv);
-	} else if (mount(fd, -1, "/net", MBEFORE, "") < 0)
-		sysfatal("can't mount in /net: %r");
+	} else if (timedmount(fd, -1, netdir, MBEFORE, "") < 0) {
+		fprint(2, "can't mount %s on %s: %r\n", srv, netdir);
+		close(fd);
+	}
 }
 
 static void
@@ -423,7 +446,7 @@
 remotecmd(int argc, char *argv[], int conn, int chan, char *buf, int size)
 {
 	int i;
-	char *path, *q;
+	char *path, *q, *ep;
 
 	path = esmprint("%s/ssh/%d/%d/request", netdir, conn, chan);
 	reqfd = open(path, OWRITE);
@@ -435,17 +458,17 @@
 		else
 			fprint(reqfd, "shell %s", buf);
 	else {
-		q = buf;
 		assert(size >= Bigbufsz);
+		ep = buf + Bigbufsz;
+		q = seprint(buf, ep, "exec");
 		for (i = 0; i < argc; ++i)
-			q = seprint(q, buf + Bigbufsz, " %s", argv[i]);
-		if (q < buf + Bigbufsz)
-			fprint(reqfd, "exec%s", buf);
-		else {
+			q = seprint(q, ep, " %q", argv[i]);
+		if (q >= ep) {
 			fprint(2, "%s: command too long\n", argv0);
 			fprint(reqfd, "close");
 			bail("cmd too long");
 		}
+		write(reqfd, buf, q - buf);
 	}
 }
 
@@ -460,20 +483,31 @@
 		notefd = keyfd = -1;
 	whichkey = nil;
 	ARGBEGIN {
-	case 'a':
-	case 'v':
-	case 'x':
+	case 'A':			/* auth protos */
+	case 'c':			/* ciphers */
+		fprint(2, "%s: sorry, -%c is not supported\n", argv0, ARGC());
+		break;
+	case 'a':			/* compat? */
+	case 'C':			/* cooked mode */
+	case 'f':			/* agent forwarding */
+	case 'p':			/* force pty */
+	case 'P':			/* force no pty */
+	case 'R':			/* force raw mode on pty */
+	case 'v':			/* scp compat */
+	case 'w':			/* send window-size changes */
+	case 'x':			/* unix compat: no x11 forwarding */
 		break;
 	case 'd':
 		debug++;
 		break;
-	case 'I':
+	case 'I':			/* non-interactive */
 		iflag = 0;
 		break;
-	case 'i':		/* Used by scp */
+	case 'i':			/* interactive: scp & rx do it */
 		iflag = 1;
 		break;
 	case 'l':
+	case 'u':
 		user = EARGF(usage());
 		break;
 	case 'k':
@@ -518,7 +552,7 @@
 	if ((n = rfork(RFPROC|RFMEM|RFFDG|RFNOWAIT)) == 0)
 		keyproc(buf, sizeof buf);
 	chpid = n;
-	atnotify(handler,1);
+	atnotify(handler, 1);
 
 	/* connect and learn connection number */
 	conn = connect(buf, sizeof buf);
--- /sys/src/cmd/ssh2/sshsession.c	Thu Apr 19 15:20:39 2012
+++ /sys/src/cmd/ssh2/sshsession.c	Mon Apr 23 09:10:17 2012
@@ -110,7 +110,7 @@
 		hangup(ctlfd);
 		exits("open");
 	}
-	if (mount(fd, -1, "/net", MBEFORE, "") < 0) {
+	if (mount(fd, -1, netdir, MBEFORE, "") < 0) {
 		syslog(0, "ssh", "can't mount in /net: %r");
 		hangup(ctlfd);
 		exits("can't mount");