diff -ru2N ssh-1.2.22/sshd.c ssh-MCC/sshd.c
--- ssh-1.2.22/sshd.c	Thu Feb 26 16:47:06 1998
+++ ssh-MCC/sshd.c	Fri Feb 27 09:42:52 1998
@@ -1618,5 +1618,5 @@
    */
   {
-    if (strncmp(passwd,"*LK*", 4) == 0)
+    if (passwd[0] == '*')
       {
 	debug("Account %.100s is locked.", user);
diff -ru2N ssh-1.2.22/Makefile.in ssh-MCC/Makefile.in
--- ssh-1.2.22/Makefile.in	Thu Feb 26 16:47:01 1998
+++ ssh-MCC/Makefile.in	Thu Feb 26 16:49:33 1998
@@ -487,5 +487,15 @@
 # bound to a non-privileged port).  Also, password authentication may
 # not be available if non-root and using shadow passwords.
-install: $(PROGRAMS) make-dirs generate-host-key install-configs
+install: $(PROGRAMS) make-dirs
+	install -s -m 4555 ssh $(bindir)
+	ln -f $(bindir)/ssh $(bindir)/slogin
+	install -s -m 555 ssh-keygen ssh-agent ssh-add scp ssh-askpass \
+		$(bindir)
+	install -s -m 555 sshd make-ssh-known-hosts $(sbindir)
+	for p in ssh-keygen.1 ssh-agent.1 ssh-add.1 scp.1 \
+	    ssh.1 make-ssh-known-hosts.1;do \
+		install -m 444 $$p $(man1dir)/$$p;done
+	install -m 444 sshd.8 $(man8dir)
+dummy:
 	-rm -f $(install_prefix)$(bindir)/ssh.old
 	-mv $(install_prefix)$(bindir)/ssh $(install_prefix)$(bindir)/ssh.old
diff -ru2N ssh-1.2.22/make-ssh-known-hosts.pl ssh-MCC/make-ssh-known-hosts.pl
--- ssh-1.2.22/make-ssh-known-hosts.pl	Tue Jan 20 12:20:14 1998
+++ ssh-MCC/make-ssh-known-hosts.pl	Thu Feb 26 16:49:33 1998
@@ -73,4 +73,5 @@
 use Socket;
 use Fcntl;
+use Net::Ping;
 
 $version = ' $Id: make-ssh-known-hosts.pl,v 1.3 1997/04/17 04:21:27 kivinen Exp $ ';
@@ -109,10 +110,9 @@
 
 unlink($private_ssh_known_hosts);
-$sockaddr = 'S n a4 x8';
 ($junk, $junk, $sshport) = getservbyname("ssh", "tcp");
 if (!defined($sshport)) {
     $sshport = 22;
 }
-($tcpprotoname, $junk, $tcpproto) = getprotobyname('tcp');
+($tcpprotoname, $junk, $junk) = getprotobyname('tcp');
 defined($tcpprotoname) || die "getprotobyname : $!";
 
@@ -422,8 +422,6 @@
 sub try_ping {
     my($host, $ipaddrs) = @_;
-    my(@ipaddrs, $ipaddr, $serv, $ip);
-    my($rin, $rout, $win, $wout, $nfound, $tmout, $buf, $len, $ret, $err);
+    my(@ipaddrs, $ipaddr);
 
-    $buf = '';
     debug(51,"Trying to ping host $host");
     @ipaddrs = split(/,/, $ipaddrs);
@@ -433,65 +431,13 @@
 	debug(55,"Trying ipaddr $ipaddr");
 	
-	#initialize socket
-	socket(PING, PF_INET, SOCK_STREAM, $tcpproto) ||
-	    die "socket failed : $!";
-	setsockopt(PING, SOL_SOCKET, SO_REUSEADDR, 1) ||
-	    die "setsockopt failed : $!";
-	PING->autoflush(1);
-	fcntl(PING, F_SETFL, fcntl(PING, F_GETFL, 0) | POSIX::O_NONBLOCK) ||
-	    die "fcntl failed : $!";
-	
-        $ip = pack('C4', split(/\./, $ipaddr, 4));
-	$serv = pack($sockaddr, AF_INET, $sshport, $ip);
-	
-      again:
-	# try connect
-	$ret = connect(PING, $serv);
-	$err = $!;
-	if (!$ret) {
-	    debug(60, "Connect failed : $err");
-	    if ($err == EINTR) {
-		goto again;
-	    }
-	    # socket not yet connected, wait for result, it will
-	    # wake up for writing when done
-	    $tmout = $ping_timeout;
-	    
- 	    $rin = '';
-	    $win = '';
-	    vec($rin, fileno(PING), 1) = 1;
-	    vec($win, fileno(PING), 1) = 1;
-	    debug(60, "Waiting in select, rin = " . unpack('H*', $rin) .
-		  ", win = " . unpack('H*', $win));
-	    ($nfound) = select($rout = $rin, $wout = $win, undef, $tmout);
-	    $err = $!;
-	    debug(80, "Select returned $nfound, rout = " . unpack('H*', $rout) .
-		  ", wout = " . unpack('H*', $wout));
-	    if ($nfound != 0) {
-		# connect done, read the status with sysread
-		$ret = sysread(PING, $buf, 1);
-		$err = $!;
-		if (defined($ret) || $err == EAGAIN || $err == EWOULDBLOCK) {
-		    debug(60, "Select ok, read ok ($err), returning ok");
-		    # connection done, return ok
-		    shutdown(PING, 2);
-		    close(PING);
-		    return 1;
-		} else {
-		    # connection failed, try next ipaddr
-		    debug(60, "Select ok, read failed : $err, trying next");
-		    close(PING);
-		}
-	    } else {
-		# timeout exceeded, try next ipaddr
-		debug(60, "Select failed : $err, trying next");
-		close(PING);
-	    }
-	} else {
-	    # connect succeeded, return ok.
-	    debug(60, "Connect ok, returning ok");
-	    shutdown(PING, 2);
-	    close(PING);
+	if (pingecho($ipaddr, 5)) {
+	    debug(60, "Net::Ping ok, returning ok");
+	    return 1;
+	} elsif (`/usr/sbin/ping $ipaddr -n 1`) {
+	    debug(60, "ping command ok, returning ok");
 	    return 1;
+	} else {
+	# timeout exceeded, try next ipaddr
+	    debug(60, "ping failed, trying next");
 	}
     }
@@ -684,14 +630,2 @@
     return($server, @other_servers);
 }
-
-######################################################################
-# make_perl_happy -- use some symbols, so perl doesn't complain so much
-# make_perl_happy();
-
-sub make_perl_happy {
-    if (0) {
-	print $FileHandle::ARG, $opt_silent;
-    }
-}
-
-1;