source-changes: sun-lamp CVS commits

Subject: sun-lamp CVS commits
To: None <source-changes@pain.lcs.mit.edu>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 03/21/1995 02:50:02

glass
Tue Mar 21 02:48:17 EST 1995
Update of /a/cvsroot/src/sys/netinet
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv8021

Modified Files:
	tcp_usrreq.c 
Log Message:
Default linger time was 120 clock ticks instead of the intended
2 minutes.
[Bug pointed out by Wright/Stevens in TCP/IP Illustrated Vol II]

cgd
Tue Mar 21 02:48:30 EST 1995
Update of /a/cvsroot/src/usr.bin/rlogin
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv8038

Revision/Branch: 1.1.1

Log Message:
usr.bin/rlogin from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
N src/usr.bin/rlogin/des_rw.c
N src/usr.bin/rlogin/kcmd.c
N src/usr.bin/rlogin/krb.h
N src/usr.bin/rlogin/krcmd.c
C src/usr.bin/rlogin/Makefile
C src/usr.bin/rlogin/rlogin.1
C src/usr.bin/rlogin/rlogin.c

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/rlogin