perry
Tue Jan  2 12:41:51 EST 1996
Update of /a/cvsroot/src/usr.sbin/syslogd
In directory pain.lcs.mit.edu:/a/users/perry/work/syslogd

Modified Files:
	syslog.conf.5 syslogd.8 
Log Message:
Merge/sync with 4.4lite2. Fixed HISTORY line for syslog.conf.5. Note
that the claim in the HISTORY line for syslogd.8 that it appeared in
4.3BSD is probably bogus -- I remember it being a lot older.


perry
Tue Jan  2 12:48:43 EST 1996
Update of /a/cvsroot/src/usr.sbin/syslogd
In directory pain.lcs.mit.edu:/a/users/perry/work/syslogd

Modified Files:
	syslogd.c 
Log Message:
Merge/Sync with 4.4lite2. This is the 4.4lite2 version with NetBSD bug
fixes thrown in (and an apparent pre-NetBSD fix to a hardcoded
"vmunix"). I also set the ttymsg timeout to one second (as per our
previous version), rather than the five minutes set in lite2, and made
the timeout set by a #define.