Update to a current CVS_DATE. The only real change I see is the (big)

change of KNFization being finalized :)

Patches had to be modified, but should look "better" according to
style(9), now.

4 files changed, 157 insertions, 155 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index e21f2032fdd7..f9f40500634b 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -23,7 +23,7 @@ CAT?=		/bin/cat
 DISTFILES!=	${CAT} ${FILESDIR}/distfiles
 
 CVS_CMD?=	cvs -z3
-CVS_DATE=	Tue Nov 23 18:52:21 EST 1999
+CVS_DATE=	Sun Nov 28 16:31:22 EST 1999
 SED?=		/usr/bin/sed
 CVS_DATE_!=	${ECHO} -n ${CVS_DATE} | ${SED} 's/[ \t:]/_/g'
 CVS_SITES=	anoncvs@anoncvs1.ca.openbsd.org:/cvs \
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index da231b351963..5b49e896e12e 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -4,89 +4,89 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/Makefile.inc) = 8f096d4d5a830efe7dde5674b482cd2
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/OVERVIEW) = 5def77be758d9e4aa2390c3825ed7cb2
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/README) = e54fb9189053db5ad25892054c8d0989
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/RFC.nroff) = 1615f30810a3d47716883b2eaddd712c
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-krb4.c) = afb4f094a0377bf941132d699133061e
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-passwd.c) = 8b5bc717a6bf9e4d2902303e02e93c66
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rh-rsa.c) = b0db15995763bc8d73e3fe3d2b7c480b
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rhosts.c) = 77f41a35c345e90bb6fc2bd64df703a7
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rsa.c) = 0c7332ede8b134d4ebb3acb361e6c197
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-krb4.c) = abe1935f21e88ed018d788a4117129b7
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-passwd.c) = 9842b40294e7fc0ea4bc1c3366378e03
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rh-rsa.c) = a1c4177fb07f7dcc4dbe6c468bab608e
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rhosts.c) = 50c042e1a659782bba7e1edd7c43c233
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rsa.c) = 4beed200d604b9d6c1dc57d604fc3ab5
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-skey.c) = 7e0247aa6636cbb8cd5998941a757040
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.c) = d71787a9c2c2ca31b206646f770c2629
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.h) = fb324de954d588249db26709b6c1cc05
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfile.c) = 0c68fc47e6cfd2e34c4b9e21deaec8cc
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/bufaux.c) = 8c0b7731009cf11cb9a000746e81003e
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/bufaux.h) = e4f6b704a67973170d44695f3b566f05
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/buffer.c) = 8dc56b33f83178b347628653f9c468a1
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/buffer.h) = ad31925577a5b090b36afc0858ee4ef8
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/canohost.c) = 2fd9f1687a94eeb1d5c612e666f4713b
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/channels.c) = f0b98fb8bb451e793521f252e8eaa0bb
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/channels.h) = 72d03b7b023c7d794c28b38ce43d9e5b
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.c) = 96ce2a2d600f7b420d4d8a796380f3f4
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.h) = e8167ec15b1da0a2c6015fe5751b8034
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/clientloop.c) = a1fef42b6e993b297fb60188263384ef
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/compat.c) = bd8c95e51f91b958282bec3ec1b64d54
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/compat.h) = 8d4063d6eb22bd9b9aba4f768a96ce65
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/compress.c) = 1dcf1a183369c45f3c052414419e6f41
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/compress.h) = 47384fb71f7411a8367fc2ab92bc60cf
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/crc32.c) = f8e255b74718e9cdb9031ddf31248daa
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/crc32.h) = ca822d3b56144b7f3ebf23505696df64
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/deattack.c) = 5a0b0f9f1865059a7cbecbb34f570454
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/deattack.h) = 84cd5fc5ab5857659c337495f13e97af
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/fingerprint.c) = 53cd4c63d2f870b7ef46743f2d0b311e
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/fingerprint.h) = a3a4ab65be79f9b26015131290493b3b
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/getput.h) = 564761caa67f9c507e73b2383f86dc0c
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/hostfile.c) = 0d6ed37ca0a42a94568909736041f042
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/includes.h) = 21a803e66cf63001eaf3fd22bf6c2b54
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.c) = 4075b45c09b561dee0e5fef4dc88527b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.h) = 84826e6490812a490bb07b97dfeef085
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfile.c) = 1c28a8018b613416d23aae6a25718ccc
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/bufaux.c) = 877a21dbdd68ef04a1e39a0e6d34450e
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/bufaux.h) = 46caf1274857d0bdc5eabe60d56f6aaf
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/buffer.c) = 6cea321387c23d5cfaefca38bc167c1f
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/buffer.h) = c284a258593ae4d8905d94ddae45f4b1
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/canohost.c) = 770f45643983946333cbb9ffde77500b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/channels.c) = 39fc9f7d20f9f758f0a3fa3f102383a8
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/channels.h) = e597ecd2255e0f92fb5a92c40c99d8b4
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.c) = 2bf8f287540f2448b4af0b894aeacf8b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.h) = e1b48bd7a4e37c1b106f968d8377b843
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/clientloop.c) = cf820b3225666f8a9cf41e5f73e35267
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/compat.c) = 08c12cb64c7bc91f90ff6480e53097b9
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/compat.h) = c4228db03a5cb0b46a7aa4f11d046564
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/compress.c) = 50d1d17fec498f13d65327a5f98398b2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/compress.h) = 1dc8f39d85e998b083968d2ddb675caa
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/crc32.c) = 9b71f48256fcdf65dd965679718b39cd
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/crc32.h) = 01f49f92aead5091b3d9416858fb45da
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/deattack.c) = 4f21abf0398edd93ffba792b90029aa6
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/deattack.h) = db63f71b6c19484dd8ce5041cc6b646d
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/fingerprint.c) = 782318f23ec96a679f140a475ee38638
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/fingerprint.h) = 17d73906c4f0c1cddb3c1c7e98d02785
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/getput.h) = bf729289671363abc3882e1e0c34d270
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/hostfile.c) = 085630f89c27d8da273c228132a362b5
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/includes.h) = 1dc9df93b0be59b6351755ea7817be09
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/lib/Makefile) = fcf2c95b795ebb2c3ef37eee749e0bc3
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/log-client.c) = 9de8fc9adfaf0c1689546a88e84cc409
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/log-server.c) = fc2a720ab65781702824b9575bfe8589
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/log.c) = 1ead2b24677b8c841a4aba29514a7b2a
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/login.c) = 519c0213c9fec007ad0e908e17328dff
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/match.c) = 9fb0e688f9dacc80b3d080ab62ecbdf0
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.c) = 9de92d0e83814e8532738c1d011eb557
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.h) = 2e3c5530ecd7972373baf7d23da49d51
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.c) = 808a455e877608436ae429d60349fa48
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.h) = fc559438a23bf1c4f6e7faaaf5f581a4
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.ms) = 6a168c05b13aed9a6c9b9d384edcf2c2
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.c) = 5428b751bbc62455cbe2251ddbf1cee3
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.h) = 5de24b8ab5947434366bb18e20437f68
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/pty.c) = 19b157680946dbb1de818e479e9c0006
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/pty.h) = c42c8189284dfe0d34125b77446bd062
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/radix.c) = e7cf9f687b866f00523440ea4699ea73
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/readconf.c) = b99672ec3c96010654d5ee2a8abcabc1
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/readconf.h) = 99f7e607724b941a62fb27e09965fa5a
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/readpass.c) = 17802a659dcf815d16c59090810e4aff
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/rsa.c) = 9e85c3eec42dedd666dd1b3ad73ae9e6
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/rsa.h) = b4175dcd58022ac6961ac57a255718a7
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/log-client.c) = a05d3671346fd5a958cc74d1e2416b63
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/log-server.c) = d1c4f02578b1a83c972b7acd04ea2fa2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/log.c) = 8389216c70241d8858fd4b4029361166
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/login.c) = e6d2ed8545050d71606b4b857c35af5f
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/match.c) = facc507e6b48d09f9df77c2a77b365c3
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.c) = dfbd6e43248536777546c589e80ef333
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.h) = 3dd5ddaa6baccf7f38964e69cd2f9e1c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.c) = 7f30c59c6f29660d9d954384635285f2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.h) = 884bb0c2b62f274ccbf9c0eafc9d37c2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.ms) = 815e166dc85a329c3cfd98bd8cfda930
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.c) = bac93270e95a7046cc594a6a61e76131
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.h) = 52811069d035c6900113732bf22e1456
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/pty.c) = 89e048eef46eb7d163099694b7105f65
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/pty.h) = e36e94db1c9ea38969390cc9979681a3
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/radix.c) = 599f6349035451d48e36334b21696963
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/readconf.c) = 4f4dd92f5e5f359e8909922f2a1e176f
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/readconf.h) = 6e679e6c86f0d898101549afcf1b29b3
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/readpass.c) = 77448898d33958f69d047aa78eb28e1a
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/rsa.c) = 3b47f0c260e26c118d971fafed604d3f
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/rsa.h) = ee65e38f1fcc22328c5d5f07b57d6e5f
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.1) = a9144b2b272d8ac656b1d63c71644999
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.c) = 735113a94b57ce1ecf47bef01d8ff2eb
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.c) = a6e4da9f92f2112af9a09dbd0a4ac840
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp/Makefile) = 5cb4c5fcabde5ccc4f9ca475ac3452f4
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.c) = 6efc02e63b2d185745ce8fd97ce01447
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.h) = 468c25070e4afbccf948730311690a34
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/serverloop.c) = 96f7f11223f15c6b093282b7ce38d020
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.1) = 4b97d6fbe61628569dfc12dad1fe3228
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.c) = 91f325ce167d28d582b9af04eec177b3
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.c) = 62079877f586c06b71c384e556a78be2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.h) = 056da4377475fbcded1ca288a1faf26e
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/serverloop.c) = 714ccc66c2f43587aab4408a5163dfbb
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.1) = 71930775228d2b0ce5cb1bed6ee6d962
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.c) = 1a5804bf1a3b9df12d418bdad06ff4fc
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add/Makefile) = f780e2e9fb5c32d2118ba0e612d681e0
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.1) = 33b62903d3aa452fa106b484b016bbc5
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.c) = 096ccd483df21da9b4eca4c29ada3616
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.c) = 7f32db546585cc134d8fa42179c7016e
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent/Makefile) = c7ec7c4e61b4da3369980f197fdcb501
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.1) = 746734eab948fff84a44c3383f5a1701
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.c) = c8cf1a6b060815ef8766ae880fc8e480
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.c) = 439aac7630c0dc54b750ecbe314bc09b
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen/Makefile) = 2d597b6e6458d0c0246ba2563dd2498b
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.1) = 94066f50daf11f97deded744d85cf9a4
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.c) = d6376fdbfddf79ced260cf9e4115c395
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.h) = aaf0802fc67c5f5da9e5ec6876b0b64b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.1) = 3c9e8a131a6a9df4501566a0cedda8fc
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.c) = 9412cc363131c26bf936f10d52ada317
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.h) = 01910a122ad112b849b91a9d070b34e1
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh/Makefile) = 41b006d3c04b599619990b47da60f81e
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh_config) = 9658715526aeaf0bc43528d3159b475f
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshconnect.c) = 16bce755e0cfbf6123d7fe1c94b032b4
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshconnect.c) = 8be61f808dabad6354e59b077ed5e032
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.8) = e08d1683e931a4b30e0e411d4d3576c8
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = 00032b5bc0e592bf320e3a31e8a17ed0
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = 44e69ac7064390355b2442a3b7e79a53
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd/Makefile) = d1d83d1ece775d3a5cbf8cfaaf2330f3
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd_config) = e78b81c34da5c97eee1359cccda908d6
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/tildexpand.c) = 2c7b2e407be9fa9839f2058952703de3
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ttymodes.c) = 7b72e228fc88888577fb101c09043ce2
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ttymodes.h) = 4fbb0096420efed3228d92e1576242d1
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/uidswap.c) = 43fd1c6217828f5a9cabb82a34abcb1c
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/uidswap.h) = 5af5b193e6325f20e7de4ee15877b877
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/tildexpand.c) = ebe3801a86c3c27fdbace05ae0c02621
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ttymodes.c) = 570810b08bdb8bc962630c2fbb425a00
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ttymodes.h) = a08ab0789c979c7942423e2ab3df79dd
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/uidswap.c) = a850da3d0fabd4a6c6cf7484c1105071
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/uidswap.h) = 8d855b827d8e81417d0b2e7692617c35
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/version.h) = 6ac6f1622b0ce6f24f608f0bb340e207
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/xmalloc.c) = a2e86fd60e9397c5b8b48d7872ec9c06
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/xmalloc.h) = 5ec9a25c413bf89488fe3140d2e06d7d
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/xmalloc.c) = 5d67cda10b34bc467eac083f1e0fb198
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/xmalloc.h) = 0614fab05a7974c8761069b38054753e
diff --git a/security/openssh/files/patch-al b/security/openssh/files/patch-al
index 9a81a0c067ce..dac933a7a42b 100644
--- a/security/openssh/files/patch-al
+++ b/security/openssh/files/patch-al
@@ -1,27 +1,20 @@
---- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/ssh.h	Tue Nov 23 18:58:02 1999
-+++ ./ssh.h	Tue Nov 23 19:31:00 1999
-@@ -51,7 +51,7 @@
-    port if present. */
+--- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/ssh.h	Sun Nov 28 16:47:46 1999
++++ ssh.h	Sun Nov 28 17:00:07 1999
+@@ -61,7 +61,7 @@
+  */
  #define SSH_SERVICE_NAME	"ssh"
  
 -#define ETCDIR			"/etc"
 +#define ETCDIR			"__PREFIX__/etc"
  #define PIDDIR			"/var/run"
  
- /* System-wide file containing host keys of known hosts.  This file should be
-@@ -64,11 +64,11 @@
- are all defined in Makefile.in.  Of these, ssh_host_key should be readable
- only by root, whereas ssh_config should be world-readable. */
- 
--#define HOST_KEY_FILE		"/etc/ssh_host_key"
--#define SERVER_CONFIG_FILE	"/etc/sshd_config"
--#define HOST_CONFIG_FILE	"/etc/ssh_config"
-+#define HOST_KEY_FILE		"__PREFIX__/etc/ssh_host_key"
-+#define SERVER_CONFIG_FILE	"__PREFIX__/etc/sshd_config"
-+#define HOST_CONFIG_FILE	"__PREFIX__/etc/ssh_config"
+ /*
+@@ -78,7 +78,7 @@
+ #define SERVER_CONFIG_FILE	ETCDIR "/sshd_config"
+ #define HOST_CONFIG_FILE	ETCDIR "/ssh_config"
  
 -#define SSH_PROGRAM		"/usr/bin/ssh"
 +#define SSH_PROGRAM		"__PREFIX__/bin/ssh"
  
- /* The process id of the daemon listening for connections is saved
-    here to make it easier to kill the correct daemon when necessary. */
+ /*
+  * The process id of the daemon listening for connections is saved here to
diff --git a/security/openssh/files/patch-an b/security/openssh/files/patch-an
index 8dfdf115c932..91103836ca36 100644
--- a/security/openssh/files/patch-an
+++ b/security/openssh/files/patch-an
@@ -1,6 +1,6 @@
---- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/sshd.c	Tue Nov 23 18:59:05 1999
-+++ ./sshd.c	Tue Nov 23 20:33:18 1999
-@@ -39,6 +39,16 @@
+--- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/sshd.c	Sun Nov 28 16:50:26 1999
++++ sshd.c	Sun Nov 28 17:22:27 1999
+@@ -32,6 +32,16 @@
  int deny_severity = LOG_WARNING;
  #endif /* LIBWRAP */
  
@@ -17,7 +17,7 @@
  #ifndef O_NOCTTY
  #define O_NOCTTY	0
  #endif
-@@ -1008,6 +1018,14 @@
+@@ -1048,6 +1058,14 @@
  				return 0;
  		}
  	}
@@ -25,14 +25,14 @@
 +	if (pw->pw_expire != 0) {
 +		struct timeval tv;
 +
-+	(void)gettimeofday(&tv, NULL);
-+	if (tv.tv_sec >= pw->pw_expire)
-+		return 0;
++		(void)gettimeofday(&tv, NULL);
++		if (tv.tv_sec >= pw->pw_expire)
++			return 0;
 +	}
  	/* We found no reason not to let this user try to log on... */
  	return 1;
  }
-@@ -1042,6 +1060,9 @@
+@@ -1083,6 +1101,9 @@
  	pwcopy.pw_gid = pw->pw_gid;
  	pwcopy.pw_dir = xstrdup(pw->pw_dir);
  	pwcopy.pw_shell = xstrdup(pw->pw_shell);
@@ -41,8 +41,8 @@
 +	pwcopy.pw_change = pw->pw_change;
  	pw = &pwcopy;
  
- 	/* If we are not running as root, the user must have the same uid
-@@ -1790,6 +1811,10 @@
+ 	/*
+@@ -1871,6 +1892,10 @@
  	struct sockaddr_in from;
  	int fromlen;
  	struct pty_cleanup_context cleanup_context;
@@ -53,7 +53,7 @@
  
  	/* Get remote host name. */
  	hostname = get_canonical_hostname();
-@@ -1850,6 +1875,12 @@
+@@ -1935,6 +1960,12 @@
  		/* Check if .hushlogin exists. */
  		snprintf(line, sizeof line, "%.200s/.hushlogin", pw->pw_dir);
  		quiet_login = stat(line, &st) >= 0;
@@ -64,9 +64,9 @@
 +		quiet_login = login_getcapbool(lc, "hushlogin", quiet_login);
 +#endif /* LOGIN_CAP */
  
- 		/* If the user has logged in before, display the time of
- 		   last login. However, don't display anything extra if a
-@@ -1871,12 +1902,31 @@
+ 		/*
+ 		 * If the user has logged in before, display the time of last
+@@ -1958,6 +1989,20 @@
  			else
  				printf("Last login: %s from %s\r\n", time_string, buf);
  		}
@@ -74,7 +74,7 @@
 +		if (command == NULL && !quiet_login && !options.use_login) {
 +			fname = login_getcapstr(lc, "copyright", NULL, NULL);
 +			if (fname != NULL && (f = fopen(fname, "r")) != NULL) {
-+				while (fgets(line, sizeof(line), f))
++				while (fgets(line, sizeof(line), f) != NULL)
 +					fputs(line, stdout);
 +				fclose(f);
 +			} else
@@ -84,21 +84,26 @@
 +		    "All rights reserved.");
 +		}
 +#endif /* LOGIN_CAP */
- 		/* Print /etc/motd unless a command was specified or
- 		   printing it was disabled in server options or login(1)
- 		   will be used.  Note that some machines appear to print
- 		   it in /etc/profile or similar. */
+ 		/*
+ 		 * Print /etc/motd unless a command was specified or printing
+ 		 * it was disabled in server options or login(1) will be
+@@ -1966,14 +2011,22 @@
+ 		 */
  		if (command == NULL && options.print_motd && !quiet_login &&
  		    !options.use_login) {
+-			/* Print /etc/motd if it exists. */
 +#ifdef LOGIN_CAP
 +			fname = login_getcapstr(lc, "welcome", NULL, NULL);
 +			login_close(lc);
 +			if (fname == NULL || (f = fopen(fname, "r")) == NULL)
-+#endif /* LOGIN_CAP */
- 			/* Print /etc/motd if it exists. */
++				f = fopen("/etc/motd", "r");
++#else /* LOGIN_CAP */
  			f = fopen("/etc/motd", "r");
++#endif /* LOGIN_CAP */
++			/* Print /etc/motd if it exists. */
  			if (f) {
-@@ -1885,6 +1935,7 @@
+ 				while (fgets(line, sizeof(line), f))
+ 					fputs(line, stdout);
  				fclose(f);
  			}
  		}
@@ -106,7 +111,7 @@
  		/* Do common processing for the child, such as execing the command. */
  		do_child(command, pw, term, display, auth_proto, auth_data, ttyname);
  		/* NOTREACHED */
-@@ -2030,17 +2081,38 @@
+@@ -2117,15 +2170,34 @@
  	extern char **environ;
  	struct stat st;
  	char *argv[10];
@@ -118,41 +123,35 @@
 +		lc = login_getclassbyname(NULL, pw);
 +#endif /* LOGIN_CAP */
  
- 	/* Check /etc/nologin. */
  	f = fopen("/etc/nologin", "r");
 +#ifdef __FreeBSD__
 +	if (f == NULL)
 +		f = fopen("/var/run/nologin", "r");
 +#endif /* __FreeBSD__ */
  	if (f) {
--		/* /etc/nologin exists.  Print its contents and exit. */
+ 		/* /etc/nologin exists.  Print its contents and exit. */
 -		while (fgets(buf, sizeof(buf), f))
 -			fputs(buf, stderr);
 -		fclose(f);
 -		if (pw->pw_uid != 0)
 -			exit(254);
--	}
-+		/* /etc/nologin exists. */
 +#ifdef LOGIN_CAP
-+		/*
-+		 * If the user doesn't have "ignorenologin" set, print
-+		 * its contents and exit.
-+		 */
++		/* On FreeBSD, etc., allow overriding nologin via login.conf. */
 +		if (!login_getcapbool(lc, "ignorenologin", 0)) {
++#else /* LOGIN_CAP */
++		if (1) {
 +#endif /* LOGIN_CAP */
 +			while (fgets(buf, sizeof(buf), f))
 +				fputs(buf, stderr);
 +			fclose(f);
 +			if (pw->pw_uid != 0)
 +				exit(254);
-+#ifdef LOGIN_CAP
-+		}
-+#endif /* LOGIN_CAP */
 +		}
++
+ 	}
  	/* Set login name in the kernel. */
  	if (setlogin(pw->pw_name) < 0)
- 		error("setlogin failed: %s", strerror(errno));
-@@ -2049,6 +2121,13 @@
+@@ -2135,6 +2207,13 @@
  	/* Login(1) does this as well, and it needs uid 0 for the "-h"
  	   switch, so we let login(1) to this for us. */
  	if (!options.use_login) {
@@ -166,12 +165,13 @@
  		if (getuid() == 0 || geteuid() == 0) {
  			if (setgid(pw->pw_gid) < 0) {
  				perror("setgid");
-@@ -2069,7 +2148,13 @@
- 	}
- 	/* Get the shell from the password data.  An empty shell field is
- 	   legal, and means /bin/sh. */
+@@ -2157,7 +2236,14 @@
+ 	 * Get the shell from the password data.  An empty shell field is
+ 	 * legal, and means /bin/sh.
+ 	 */
 +#ifdef LOGIN_CAP
-+	shell = login_getcapstr(lc, "shell", pw->pw_shell, pw->pw_shell);
++	shell = pw->pw_shell;
++	shell = login_getcapstr(lc, "shell", shell, shell);
 +	if (shell[0] == '\0')
 +		shell = _PATH_BSHELL;
 +#else /* LOGIN_CAP */
@@ -180,7 +180,7 @@
  
  #ifdef AFS
  	/* Try to get AFS tokens for the local cell. */
-@@ -2094,7 +2179,12 @@
+@@ -2181,7 +2267,12 @@
  		child_set_env(&env, &envsize, "USER", pw->pw_name);
  		child_set_env(&env, &envsize, "LOGNAME", pw->pw_name);
  		child_set_env(&env, &envsize, "HOME", pw->pw_dir);
@@ -193,40 +193,49 @@
  
  		snprintf(buf, sizeof buf, "%.200s/%.50s",
  			 _PATH_MAILDIR, pw->pw_name);
-@@ -2189,13 +2279,35 @@
- 	   later. */
+@@ -2271,6 +2362,9 @@
+ 	 */
  	endpwent();
  	endhostent();
 +#ifdef LOGIN_CAP
 +	login_close(lc);
 +#endif /* LOGIN_CAP */
  
- 	/* Close any extra open file descriptors so that we don\'t have
- 	   them hanging around in clients.  Note that we want to do this
- 	   after initgroups, because at least on Solaris 2.3 it leaves
- 	   file descriptors open. */
+ 	/*
+ 	 * Close any extra open file descriptors so that we don\'t have them
+@@ -2278,7 +2372,7 @@
+ 	 * initgroups, because at least on Solaris 2.3 it leaves file
+ 	 * descriptors open.
+ 	 */
 -	for (i = 3; i < 64; i++)
 +	for (i = 3; i < getdtablesize(); i++)
  		close(i);
-+
+ 
+ 	/* Change current directory to the user\'s home directory. */
+@@ -2297,6 +2391,26 @@
+ 	 * in this order).
+ 	 */
+ 	if (!options.use_login) {
 +#ifdef __FreeBSD__
-+	/*
-+	 * If the password change time is set and has passed, give the
-+	 * user a password expiry notice and chance to change it.
-+	 */
-+	if (pw->pw_change != 0) {
-+		struct timeval tv;
++		/*
++		 * If the password change time is set and has passed, give the
++		 * user a password expiry notice and chance to change it.
++		 */
++		if (pw->pw_change != 0) {
++			struct timeval tv;
 +
-+		(void)gettimeofday(&tv, NULL);
-+		if (tv.tv_sec >= pw->pw_change) {
-+			(void)printf("Sorry -- your password has expired.\n");
-+			syslog(LOG_INFO, "%s Password expired - forcing change",
-+			    pw->pw_name);
-+			if (system("/usr/bin/passwd") != 0)
-+				perror("/usr/bin/passwd");
++			(void)gettimeofday(&tv, NULL);
++			if (tv.tv_sec >= pw->pw_change) {
++				(void)printf(
++				    "Sorry -- your password has expired.\n");
++				syslog(LOG_INFO,
++				    "%s Password expired - forcing change",
++				    pw->pw_name);
++				if (system("/usr/bin/passwd") != 0)
++					perror("/usr/bin/passwd");
++			}
 +		}
-+	}
 +#endif /* __FreeBSD__ */
- 
- 	/* Change current directory to the user\'s home directory. */
- 	if (chdir(pw->pw_dir) < 0)
+ 		if (stat(SSH_USER_RC, &st) >= 0) {
+ 			if (debug_flag)
+ 				fprintf(stderr, "Running /bin/sh %s\n", SSH_USER_RC);