From owner-cvs-usrsbin Sun Jan 26 23:37:11 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id XAA23571 for cvs-usrsbin-outgoing; Sun, 26 Jan 1997 23:37:11 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id XAA23564; Sun, 26 Jan 1997 23:37:09 -0800 (PST) Date: Sun, 26 Jan 1997 23:37:09 -0800 (PST) From: Peter Wemm Message-Id: <199701270737.XAA23564@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrsbin Subject: cvs commit: src/usr.sbin/sendmail - Imported sources Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 97/01/26 23:37:09 src/usr.sbin/sendmail - Imported sources Update of /home/ncvs/src/usr.sbin/sendmail In directory freefall.freebsd.org:/c/peter/sm/sendmail-8.8.5 Revision/Branch: 1.1.1 Log Message: Import sendmail 8.8.5. See RELEASE_NOTES for changes. Obtained from: ftp.sendmail.org:/pub/sendmail Status: Vendor Tag: ALLMAN Release Tags: v8_8_5 U src/usr.sbin/sendmail/FAQ U src/usr.sbin/sendmail/KNOWNBUGS U src/usr.sbin/sendmail/Makefile U src/usr.sbin/sendmail/READ_ME U src/usr.sbin/sendmail/RELEASE_NOTES U src/usr.sbin/sendmail/doc/op/Makefile U src/usr.sbin/sendmail/doc/op/op.me U src/usr.sbin/sendmail/doc/changes/Makefile U src/usr.sbin/sendmail/doc/changes/changes.me U src/usr.sbin/sendmail/doc/intro/Makefile U src/usr.sbin/sendmail/doc/intro/intro.me U src/usr.sbin/sendmail/doc/usenix/Makefile U src/usr.sbin/sendmail/doc/usenix/usenix.me U src/usr.sbin/sendmail/mail.local/Makefile U src/usr.sbin/sendmail/mail.local/mail.local.8 U src/usr.sbin/sendmail/mail.local/mail.local.c U src/usr.sbin/sendmail/mail.local/pathnames.h U src/usr.sbin/sendmail/mailstats/Makefile U src/usr.sbin/sendmail/mailstats/mailstats.8 U src/usr.sbin/sendmail/mailstats/mailstats.c U src/usr.sbin/sendmail/makemap/Makefile U src/usr.sbin/sendmail/makemap/makemap.8 U src/usr.sbin/sendmail/makemap/makemap.c U src/usr.sbin/sendmail/smrsh/Makefile U src/usr.sbin/sendmail/smrsh/README U src/usr.sbin/sendmail/smrsh/smrsh.8 U src/usr.sbin/sendmail/smrsh/smrsh.c U src/usr.sbin/sendmail/src/Makefile U src/usr.sbin/sendmail/src/READ_ME U src/usr.sbin/sendmail/src/TRACEFLAGS U src/usr.sbin/sendmail/src/alias.c U src/usr.sbin/sendmail/src/aliases U src/usr.sbin/sendmail/src/aliases.5 U src/usr.sbin/sendmail/src/arpadate.c U src/usr.sbin/sendmail/src/cdefs.h U src/usr.sbin/sendmail/src/clock.c C src/usr.sbin/sendmail/src/collect.c C src/usr.sbin/sendmail/src/conf.c C src/usr.sbin/sendmail/src/conf.h U src/usr.sbin/sendmail/src/convtime.c C src/usr.sbin/sendmail/src/daemon.c C src/usr.sbin/sendmail/src/deliver.c U src/usr.sbin/sendmail/src/domain.c U src/usr.sbin/sendmail/src/envelope.c U src/usr.sbin/sendmail/src/err.c C src/usr.sbin/sendmail/src/headers.c U src/usr.sbin/sendmail/src/ldap_map.h U src/usr.sbin/sendmail/src/macro.c U src/usr.sbin/sendmail/src/mailq.1 U src/usr.sbin/sendmail/src/mailstats.h C src/usr.sbin/sendmail/src/main.c U src/usr.sbin/sendmail/src/map.c U src/usr.sbin/sendmail/src/mci.c C src/usr.sbin/sendmail/src/mime.c U src/usr.sbin/sendmail/src/newaliases.1 U src/usr.sbin/sendmail/src/parseaddr.c U src/usr.sbin/sendmail/src/pathnames.h U src/usr.sbin/sendmail/src/queue.c C src/usr.sbin/sendmail/src/readcf.c U src/usr.sbin/sendmail/src/recipient.c C src/usr.sbin/sendmail/src/savemail.c C src/usr.sbin/sendmail/src/sendmail.8 C src/usr.sbin/sendmail/src/sendmail.h U src/usr.sbin/sendmail/src/sendmail.hf C src/usr.sbin/sendmail/src/srvrsmtp.c U src/usr.sbin/sendmail/src/stab.c U src/usr.sbin/sendmail/src/stats.c U src/usr.sbin/sendmail/src/sysexits.c U src/usr.sbin/sendmail/src/trace.c C src/usr.sbin/sendmail/src/udb.c U src/usr.sbin/sendmail/src/useful.h C src/usr.sbin/sendmail/src/usersmtp.c C src/usr.sbin/sendmail/src/util.c U src/usr.sbin/sendmail/src/version.c U src/usr.sbin/sendmail/test/t_seteuid.c U src/usr.sbin/sendmail/test/t_setreuid.c U src/usr.sbin/sendmail/test/Results U src/usr.sbin/sendmail/cf/README C src/usr.sbin/sendmail/cf/cf/Makefile U src/usr.sbin/sendmail/cf/cf/chez.cs.mc U src/usr.sbin/sendmail/cf/cf/clientproto.mc U src/usr.sbin/sendmail/cf/cf/cs-hpux10.mc U src/usr.sbin/sendmail/cf/cf/cs-hpux9.mc U src/usr.sbin/sendmail/cf/cf/cs-osf1.mc U src/usr.sbin/sendmail/cf/cf/cs-solaris2.mc U src/usr.sbin/sendmail/cf/cf/cs-sunos4.1.mc U src/usr.sbin/sendmail/cf/cf/cs-ultrix4.mc U src/usr.sbin/sendmail/cf/cf/cyrusproto.mc U src/usr.sbin/sendmail/cf/cf/generic-bsd4.4.mc U src/usr.sbin/sendmail/cf/cf/generic-hpux10.mc U src/usr.sbin/sendmail/cf/cf/generic-hpux9.mc U src/usr.sbin/sendmail/cf/cf/generic-nextstep3.3.mc U src/usr.sbin/sendmail/cf/cf/generic-osf1.mc U src/usr.sbin/sendmail/cf/cf/generic-solaris2.mc U src/usr.sbin/sendmail/cf/cf/generic-sunos4.1.mc U src/usr.sbin/sendmail/cf/cf/generic-ultrix4.mc U src/usr.sbin/sendmail/cf/cf/huginn.cs.mc C src/usr.sbin/sendmail/cf/cf/knecht.mc U src/usr.sbin/sendmail/cf/cf/mail.cs.mc U src/usr.sbin/sendmail/cf/cf/mail.eecs.mc U src/usr.sbin/sendmail/cf/cf/mailspool.cs.mc U src/usr.sbin/sendmail/cf/cf/python.cs.mc U src/usr.sbin/sendmail/cf/cf/s2k-osf1.mc U src/usr.sbin/sendmail/cf/cf/s2k-ultrix4.mc U src/usr.sbin/sendmail/cf/cf/tcpproto.mc U src/usr.sbin/sendmail/cf/cf/ucbarpa.mc U src/usr.sbin/sendmail/cf/cf/ucbvax.mc U src/usr.sbin/sendmail/cf/cf/uucpproto.mc U src/usr.sbin/sendmail/cf/cf/vangogh.cs.mc U src/usr.sbin/sendmail/cf/domain/Berkeley.EDU.m4 U src/usr.sbin/sendmail/cf/domain/CS.Berkeley.EDU.m4 U src/usr.sbin/sendmail/cf/domain/EECS.Berkeley.EDU.m4 U src/usr.sbin/sendmail/cf/domain/S2K.Berkeley.EDU.m4 U src/usr.sbin/sendmail/cf/domain/generic.m4 U src/usr.sbin/sendmail/cf/domain/berkeley-only.m4 U src/usr.sbin/sendmail/cf/feature/allmasquerade.m4 U src/usr.sbin/sendmail/cf/feature/always_add_domain.m4 U src/usr.sbin/sendmail/cf/feature/bestmx_is_local.m4 U src/usr.sbin/sendmail/cf/feature/bitdomain.m4 U src/usr.sbin/sendmail/cf/feature/domaintable.m4 U src/usr.sbin/sendmail/cf/feature/genericstable.m4 U src/usr.sbin/sendmail/cf/feature/limited_masquerade.m4 U src/usr.sbin/sendmail/cf/feature/local_procmail.m4 U src/usr.sbin/sendmail/cf/feature/mailertable.m4 U src/usr.sbin/sendmail/cf/feature/masquerade_entire_domain.m4 U src/usr.sbin/sendmail/cf/feature/masquerade_envelope.m4 U src/usr.sbin/sendmail/cf/feature/nocanonify.m4 U src/usr.sbin/sendmail/cf/feature/nodns.m4 U src/usr.sbin/sendmail/cf/feature/notsticky.m4 U src/usr.sbin/sendmail/cf/feature/nouucp.m4 U src/usr.sbin/sendmail/cf/feature/nullclient.m4 U src/usr.sbin/sendmail/cf/feature/redirect.m4 U src/usr.sbin/sendmail/cf/feature/smrsh.m4 U src/usr.sbin/sendmail/cf/feature/stickyhost.m4 U src/usr.sbin/sendmail/cf/feature/use_ct_file.m4 U src/usr.sbin/sendmail/cf/feature/use_cw_file.m4 U src/usr.sbin/sendmail/cf/feature/uucpdomain.m4 U src/usr.sbin/sendmail/cf/feature/virtusertable.m4 U src/usr.sbin/sendmail/cf/hack/cssubdomain.m4 U src/usr.sbin/sendmail/cf/m4/cf.m4 U src/usr.sbin/sendmail/cf/m4/cfhead.m4 U src/usr.sbin/sendmail/cf/m4/nullrelay.m4 U src/usr.sbin/sendmail/cf/m4/proto.m4 U src/usr.sbin/sendmail/cf/m4/version.m4 U src/usr.sbin/sendmail/cf/mailer/cyrus.m4 U src/usr.sbin/sendmail/cf/mailer/fax.m4 U src/usr.sbin/sendmail/cf/mailer/local.m4 U src/usr.sbin/sendmail/cf/mailer/mail11.m4 U src/usr.sbin/sendmail/cf/mailer/phquery.m4 U src/usr.sbin/sendmail/cf/mailer/pop.m4 U src/usr.sbin/sendmail/cf/mailer/procmail.m4 U src/usr.sbin/sendmail/cf/mailer/smtp.m4 U src/usr.sbin/sendmail/cf/mailer/usenet.m4 U src/usr.sbin/sendmail/cf/mailer/uucp.m4 U src/usr.sbin/sendmail/cf/ostype/aix2.m4 U src/usr.sbin/sendmail/cf/ostype/aix3.m4 U src/usr.sbin/sendmail/cf/ostype/aix4.m4 U src/usr.sbin/sendmail/cf/ostype/altos.m4 U src/usr.sbin/sendmail/cf/ostype/amdahl-uts.m4 U src/usr.sbin/sendmail/cf/ostype/aux.m4 U src/usr.sbin/sendmail/cf/ostype/bsd4.3.m4 U src/usr.sbin/sendmail/cf/ostype/bsd4.4.m4 U src/usr.sbin/sendmail/cf/ostype/bsdi1.0.m4 U src/usr.sbin/sendmail/cf/ostype/bsdi2.0.m4 U src/usr.sbin/sendmail/cf/ostype/dgux.m4 U src/usr.sbin/sendmail/cf/ostype/domainos.m4 U src/usr.sbin/sendmail/cf/ostype/dynix3.2.m4 U src/usr.sbin/sendmail/cf/ostype/hpux10.m4 U src/usr.sbin/sendmail/cf/ostype/hpux9.m4 U src/usr.sbin/sendmail/cf/ostype/irix4.m4 U src/usr.sbin/sendmail/cf/ostype/irix5.m4 U src/usr.sbin/sendmail/cf/ostype/isc4.1.m4 U src/usr.sbin/sendmail/cf/ostype/linux.m4 U src/usr.sbin/sendmail/cf/ostype/maxion.m4 U src/usr.sbin/sendmail/cf/ostype/mklinux.m4 U src/usr.sbin/sendmail/cf/ostype/nextstep.m4 U src/usr.sbin/sendmail/cf/ostype/osf1.m4 N src/usr.sbin/sendmail/cf/ostype/powerux.m4 U src/usr.sbin/sendmail/cf/ostype/ptx2.m4 U src/usr.sbin/sendmail/cf/ostype/riscos4.5.m4 U src/usr.sbin/sendmail/cf/ostype/sco3.2.m4 N src/usr.sbin/sendmail/cf/ostype/sinix.m4 U src/usr.sbin/sendmail/cf/ostype/solaris2.m4 U src/usr.sbin/sendmail/cf/ostype/solaris2.ml.m4 U src/usr.sbin/sendmail/cf/ostype/sunos3.5.m4 U src/usr.sbin/sendmail/cf/ostype/sunos4.1.m4 U src/usr.sbin/sendmail/cf/ostype/svr4.m4 U src/usr.sbin/sendmail/cf/ostype/ultrix4.m4 U src/usr.sbin/sendmail/cf/ostype/unknown.m4 U src/usr.sbin/sendmail/cf/ostype/uxpds.m4 U src/usr.sbin/sendmail/cf/sh/makeinfo.sh U src/usr.sbin/sendmail/cf/siteconfig/uucp.cogsci.m4 U src/usr.sbin/sendmail/cf/siteconfig/uucp.old.arpa.m4 U src/usr.sbin/sendmail/cf/siteconfig/uucp.ucbarpa.m4 U src/usr.sbin/sendmail/cf/siteconfig/uucp.ucbvax.m4 U src/usr.sbin/sendmail/praliases/Makefile U src/usr.sbin/sendmail/praliases/praliases.8 U src/usr.sbin/sendmail/praliases/praliases.c U src/usr.sbin/sendmail/rmail/Makefile U src/usr.sbin/sendmail/rmail/rmail.8 U src/usr.sbin/sendmail/rmail/rmail.c U src/usr.sbin/sendmail/contrib/README U src/usr.sbin/sendmail/contrib/bitdomain.c U src/usr.sbin/sendmail/contrib/bsdi.mc U src/usr.sbin/sendmail/contrib/converting.sun.configs U src/usr.sbin/sendmail/contrib/etrn.pl U src/usr.sbin/sendmail/contrib/expn.pl U src/usr.sbin/sendmail/contrib/mail.local.linux U src/usr.sbin/sendmail/contrib/mailprio U src/usr.sbin/sendmail/contrib/mh.patch U src/usr.sbin/sendmail/contrib/mmuegel U src/usr.sbin/sendmail/contrib/oldbind.compat.c U src/usr.sbin/sendmail/contrib/re-mqueue.pl U src/usr.sbin/sendmail/contrib/rmail.oldsys.patch 18 conflicts created by this import. Use the following command to help the merge: cvs checkout -jALLMAN:yesterday -jALLMAN src/usr.sbin/sendmail From owner-cvs-usrsbin Sun Jan 26 23:43:36 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id XAA24387 for cvs-usrsbin-outgoing; Sun, 26 Jan 1997 23:43:36 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id XAA24380; Sun, 26 Jan 1997 23:43:34 -0800 (PST) Date: Sun, 26 Jan 1997 23:43:34 -0800 (PST) From: Peter Wemm Message-Id: <199701270743.XAA24380@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrsbin Subject: cvs commit: src/usr.sbin/sendmail/cf/cf Makefile src/usr.sbin/sendmail/src collect.c conf.c conf.h daemon.c deliver.c headers.c main.c mime.c readcf.c savemail.c sendmail.8 sendmail.h srvrsmtp.c udb.c usersmtp.c util.c Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 97/01/26 23:43:34 Modified: usr.sbin/sendmail/cf/cf Makefile usr.sbin/sendmail/src collect.c conf.c conf.h daemon.c deliver.c headers.c main.c mime.c readcf.c savemail.c sendmail.8 sendmail.h srvrsmtp.c udb.c usersmtp.c util.c Log: Merge 8.8.4 -> 8.8.5 changes onto mainline Revision Changes Path 1.9 +3 -3 src/usr.sbin/sendmail/cf/cf/Makefile 1.7 +16 -1 src/usr.sbin/sendmail/src/collect.c 1.16 +32 -22 src/usr.sbin/sendmail/src/conf.c 1.14 +84 -18 src/usr.sbin/sendmail/src/conf.h 1.13 +5 -4 src/usr.sbin/sendmail/src/daemon.c 1.13 +21 -13 src/usr.sbin/sendmail/src/deliver.c 1.8 +6 -2 src/usr.sbin/sendmail/src/headers.c 1.11 +72 -35 src/usr.sbin/sendmail/src/main.c 1.5 +22 -20 src/usr.sbin/sendmail/src/mime.c 1.9 +22 -1 src/usr.sbin/sendmail/src/readcf.c 1.7 +4 -3 src/usr.sbin/sendmail/src/savemail.c 1.7 +3 -3 src/usr.sbin/sendmail/src/sendmail.8 1.8 +7 -4 src/usr.sbin/sendmail/src/sendmail.h 1.7 +83 -29 src/usr.sbin/sendmail/src/srvrsmtp.c 1.8 +3 -3 src/usr.sbin/sendmail/src/udb.c 1.8 +19 -7 src/usr.sbin/sendmail/src/usersmtp.c 1.12 +5 -3 src/usr.sbin/sendmail/src/util.c From owner-cvs-usrsbin Tue Jan 28 17:28:10 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA28812 for cvs-usrsbin-outgoing; Tue, 28 Jan 1997 17:28:10 -0800 (PST) Received: (from brian@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA28767; Tue, 28 Jan 1997 17:28:04 -0800 (PST) Date: Tue, 28 Jan 1997 17:28:04 -0800 (PST) From: Brian Somers Message-Id: <199701290128.RAA28767@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrsbin Subject: cvs commit: src/usr.sbin/ppp main.c timeout.h timer.c Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk brian 97/01/28 17:28:02 Modified: usr.sbin/ppp main.c timeout.h timer.c Log: Move the call to TimerService() into main.c - just after the select() call. The SIGALRM just sets a flag now, preventing the possibility of any nasty recursivness in the handler itself. Revision Changes Path 1.29 +10 -0 src/usr.sbin/ppp/main.c 1.7 +1 -0 src/usr.sbin/ppp/timeout.h 1.7 +25 -1 src/usr.sbin/ppp/timer.c From owner-cvs-usrsbin Wed Jan 29 01:41:12 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id BAA21978 for cvs-usrsbin-outgoing; Wed, 29 Jan 1997 01:41:12 -0800 (PST) Received: from tfs.com (tfs.com [140.145.250.1]) by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id BAA21938; Wed, 29 Jan 1997 01:40:36 -0800 (PST) Received: from schizo.dk.tfs.com by tfs.com (smail3.1.28.1) with SMTP id m0vpWUu-0003voC; Wed, 29 Jan 97 01:40 PST Received: from critter.dk.tfs.com (critter-home [193.162.32.19]) by schizo.dk.tfs.com (8.8.2/8.7.3) with ESMTP id KAA14734; Wed, 29 Jan 1997 10:39:58 +0100 (MET) Received: from critter.dk.tfs.com (localhost [127.0.0.1]) by critter.dk.tfs.com (8.8.2/8.8.2) with ESMTP id KAA14306; Wed, 29 Jan 1997 10:41:19 +0100 (MET) To: Brian Somers cc: CVS-committers@freebsd.org, cvs-all@freebsd.org, cvs-usrsbin@freebsd.org Subject: Re: cvs commit: src/usr.sbin/ppp main.c timeout.h timer.c In-reply-to: Your message of "Tue, 28 Jan 1997 17:28:04 PST." <199701290128.RAA28767@freefall.freebsd.org> Date: Wed, 29 Jan 1997 10:41:18 +0100 Message-ID: <14304.854530878@critter.dk.tfs.com> From: Poul-Henning Kamp Sender: owner-cvs-usrsbin@freebsd.org X-Loop: FreeBSD.org Precedence: bulk In message <199701290128.RAA28767@freefall.freebsd.org>, Brian Somers writes: >brian 97/01/28 17:28:02 > > Modified: usr.sbin/ppp main.c timeout.h timer.c > Log: > Move the call to TimerService() into main.c - just after the select() > call. The SIGALRM just sets a flag now, preventing the possibility of > any nasty recursivness in the handler itself. Good job! -- Poul-Henning Kamp | phk@FreeBSD.ORG FreeBSD Core-team. http://www.freebsd.org/~phk | phk@login.dknet.dk Private mailbox. whois: [PHK] | phk@tfs.com TRW Financial Systems, Inc. Power and ignorance is a disgusting cocktail. From owner-cvs-usrsbin Wed Jan 29 16:49:57 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id QAA05015 for cvs-usrsbin-outgoing; Wed, 29 Jan 1997 16:49:57 -0800 (PST) Received: (from brian@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id QAA05002; Wed, 29 Jan 1997 16:49:54 -0800 (PST) Date: Wed, 29 Jan 1997 16:49:54 -0800 (PST) From: Brian Somers Message-Id: <199701300049.QAA05002@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrsbin Subject: cvs commit: src/usr.sbin/ppp main.c Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk brian 97/01/29 16:49:53 Modified: usr.sbin/ppp main.c Log: Check the timer request flag irrespective of wheter select() came back with EINTR - it's possible that it happened at some other point in the loop. Revision Changes Path 1.30 +26 -10 src/usr.sbin/ppp/main.c From owner-cvs-usrsbin Wed Jan 29 17:28:35 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA07985 for cvs-usrsbin-outgoing; Wed, 29 Jan 1997 17:28:35 -0800 (PST) Received: from time.cdrom.com (time.cdrom.com [204.216.27.226]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id RAA07970; Wed, 29 Jan 1997 17:28:33 -0800 (PST) Received: from time.cdrom.com (localhost [127.0.0.1]) by time.cdrom.com (8.8.5/8.6.9) with ESMTP id RAA11562; Wed, 29 Jan 1997 17:28:31 -0800 (PST) To: Brian Somers cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrsbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.sbin/ppp main.c In-reply-to: Your message of "Wed, 29 Jan 1997 16:49:54 PST." <199701300049.QAA05002@freefall.freebsd.org> Date: Wed, 29 Jan 1997 17:28:31 -0800 Message-ID: <11559.854587711@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Could you merge these into 2.2 also? Thanks! It's just easier if the principle does the merging so that various feet remain unstomped upon. I think you're the principle for ppp. :-) > brian 97/01/29 16:49:53 > > Modified: usr.sbin/ppp main.c > Log: > Check the timer request flag irrespective of wheter select() came back with > EINTR - it's possible that it happened at some other point in the loop. > > Revision Changes Path > 1.30 +26 -10 src/usr.sbin/ppp/main.c From owner-cvs-usrsbin Thu Jan 30 15:29:33 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id PAA09858 for cvs-usrsbin-outgoing; Thu, 30 Jan 1997 15:29:33 -0800 (PST) Received: from awfulhak.demon.co.uk (awfulhak.demon.co.uk [158.152.17.1]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id PAA09837; Thu, 30 Jan 1997 15:29:22 -0800 (PST) Received: from awfulhak.demon.co.uk (localhost.coverform.lan [127.0.0.1]) by awfulhak.demon.co.uk (8.8.4/8.7.3) with ESMTP id TAA19677; Thu, 30 Jan 1997 19:25:47 GMT Message-Id: <199701301925.TAA19677@awfulhak.demon.co.uk> X-Mailer: exmh version 1.6.9 8/22/96 To: "Jordan K. Hubbard" cc: Brian Somers , CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrsbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.sbin/ppp main.c In-reply-to: Your message of "Wed, 29 Jan 1997 17:28:31 PST." <11559.854587711@time.cdrom.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 30 Jan 1997 19:25:46 +0000 From: Brian Somers Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Joerg said he'd merge 'em. He's explained how this is normally done too, so I'll get it right next time :) > Could you merge these into 2.2 also? Thanks! > > It's just easier if the principle does the merging so that various > feet remain unstomped upon. I think you're the principle for ppp. :-) > > > brian 97/01/29 16:49:53 > > > > Modified: usr.sbin/ppp main.c > > Log: > > Check the timer request flag irrespective of wheter select() came back with > > EINTR - it's possible that it happened at some other point in the loop. > > > > Revision Changes Path > > 1.30 +26 -10 src/usr.sbin/ppp/main.c > > -- Brian , Don't _EVER_ lose your sense of humour.... From owner-cvs-usrsbin Thu Jan 30 19:59:25 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id TAA28501 for cvs-usrsbin-outgoing; Thu, 30 Jan 1997 19:59:25 -0800 (PST) Received: from time.cdrom.com (time.cdrom.com [204.216.27.226]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id TAA28495; Thu, 30 Jan 1997 19:59:22 -0800 (PST) Received: from time.cdrom.com (localhost [127.0.0.1]) by time.cdrom.com (8.8.5/8.6.9) with ESMTP id TAA15743; Thu, 30 Jan 1997 19:59:13 -0800 (PST) To: Brian Somers cc: Brian Somers , CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-usrsbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.sbin/ppp main.c In-reply-to: Your message of "Thu, 30 Jan 1997 19:25:46 GMT." <199701301925.TAA19677@awfulhak.demon.co.uk> Date: Thu, 30 Jan 1997 19:59:13 -0800 Message-ID: <15740.854683153@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk OK, just so long as *someone* is merging them, I don't mind! :-) > Joerg said he'd merge 'em. He's explained how this is normally done > too, so I'll get it right next time :) > > > Could you merge these into 2.2 also? Thanks! > > > > It's just easier if the principle does the merging so that various > > feet remain unstomped upon. I think you're the principle for ppp. :-) > > > > > brian 97/01/29 16:49:53 > > > > > > Modified: usr.sbin/ppp main.c > > > Log: > > > Check the timer request flag irrespective of wheter select() came back with > > > EINTR - it's possible that it happened at some other point in the loop. > > > > > > Revision Changes Path > > > 1.30 +26 -10 src/usr.sbin/ppp/main.c > > > > > > -- > Brian , > > Don't _EVER_ lose your sense of humour.... > > From owner-cvs-usrsbin Sat Feb 1 09:03:14 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id JAA29765 for cvs-usrsbin-outgoing; Sat, 1 Feb 1997 09:03:14 -0800 (PST) Received: (from jhay@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id JAA29756; Sat, 1 Feb 1997 09:03:12 -0800 (PST) Date: Sat, 1 Feb 1997 09:03:12 -0800 (PST) From: John Hay Message-Id: <199702011703.JAA29756@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrsbin Subject: cvs commit: src/usr.sbin/tzsetup tzsetup.c Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jhay 97/02/01 09:03:12 Modified: usr.sbin/tzsetup tzsetup.c Log: At the end it was much simpler than I thought. 26 * 26 = 676 and not 576. South Africa and a few other countries exists again. This fix pr 2595. This should go into 2.2. Revision Changes Path 1.5 +3 -2 src/usr.sbin/tzsetup/tzsetup.c From owner-cvs-usrsbin Sat Feb 1 10:36:30 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id KAA03810 for cvs-usrsbin-outgoing; Sat, 1 Feb 1997 10:36:30 -0800 (PST) Received: (from jhay@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id KAA03803; Sat, 1 Feb 1997 10:36:29 -0800 (PST) Date: Sat, 1 Feb 1997 10:36:29 -0800 (PST) From: John Hay Message-Id: <199702011836.KAA03803@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrsbin Subject: cvs commit: src/usr.sbin/tzsetup tzsetup.c Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jhay 97/02/01 10:36:28 Branch: usr.sbin/tzsetup RELENG_2_2 Modified: usr.sbin/tzsetup tzsetup.c Log: Bring in v1.5 from -current which fix pr 2595. Revision Changes Path 1.2.2.1 +4 -3 src/usr.sbin/tzsetup/tzsetup.c From owner-cvs-usrsbin Sat Feb 1 16:59:52 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id QAA21121 for cvs-usrsbin-outgoing; Sat, 1 Feb 1997 16:59:52 -0800 (PST) Received: (from mpp@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id QAA21114; Sat, 1 Feb 1997 16:59:50 -0800 (PST) Date: Sat, 1 Feb 1997 16:59:50 -0800 (PST) From: Mike Pritchard Message-Id: <199702020059.QAA21114@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrsbin Subject: cvs commit: src/usr.sbin/mrouted mrouted.8 Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk mpp 97/02/01 16:59:50 Modified: usr.sbin/mrouted mrouted.8 Log: Update some path references to reflect reality. Submitted by: max Revision Changes Path 1.8 +8 -8 src/usr.sbin/mrouted/mrouted.8 From owner-cvs-usrsbin Sat Feb 1 17:01:57 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA21386 for cvs-usrsbin-outgoing; Sat, 1 Feb 1997 17:01:57 -0800 (PST) Received: (from mpp@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA21377; Sat, 1 Feb 1997 17:01:54 -0800 (PST) Date: Sat, 1 Feb 1997 17:01:54 -0800 (PST) From: Mike Pritchard Message-Id: <199702020101.RAA21377@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrsbin Subject: cvs commit: src/usr.sbin/mrouted mrouted.8 Sender: owner-cvs-usrsbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk mpp 97/02/01 17:01:52 Branch: usr.sbin/mrouted RELENG_2_2 Modified: usr.sbin/mrouted mrouted.8 Log: YAMFC: From rev 1.8: update some path refs. Revision Changes Path 1.5.2.2 +9 -9 src/usr.sbin/mrouted/mrouted.8