d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,914 Commits 4 Branches 49 Tags 2 GiB
211e680918
Commit Graph

3156 Commits

Author SHA1 Message Date
Doug Barton
55d7029049 Import of ISC BIND version 8.3.6. 
Version 8.3.5 was skipped due to bugs fixed in this version.
 2003-06-17 08:25:13 +00:00
Doug Barton
5d217625ac This commit was generated by cvs2svn to compensate for changes in r116464, 
which included commits to RCS files with non-trunk default branches.
 2003-06-17 08:25:13 +00:00
Mike Heffner
e1876a6e87 This never should have been here. 2003-06-16 03:06:32 +00:00
Mike Heffner
1796d6118b Import the June 15, 2003 CVS version of NetBSD's ftp + patchset to fix 
header file differences between FBSD and NBSD. Like lukemftpd, the
portable version of lukemftp lags too far behind CVS.

This import includes several big fixes plus a cleaned up manpage.
 2003-06-16 02:36:38 +00:00
Mike Heffner
fa65375d6b This commit was generated by cvs2svn to compensate for changes in r116424, 
which included commits to RCS files with non-trunk default branches.
 2003-06-16 02:36:38 +00:00
Ruslan Ermilov
cc60c35de4 2003-05-03 Ruslan Ermilov <ru@FreeBSD.org> 
* tmac/groff_mdoc.man: Slight improvements.
 2003-06-07 20:18:23 +00:00
Ruslan Ermilov
5942defa41 This commit was generated by cvs2svn to compensate for changes in r115984, 
which included commits to RCS files with non-trunk default branches.
 2003-06-07 20:18:23 +00:00
Ruslan Ermilov
48466d8c42 2003-05-22 Ruslan Ermilov <ru@FreeBSD.org> 
* tmac/X.tmac: Fix definition of `em'.
 2003-06-07 20:17:38 +00:00
Ruslan Ermilov
c29e78e78f This commit was generated by cvs2svn to compensate for changes in r115982, 
which included commits to RCS files with non-trunk default branches.
 2003-06-07 20:17:38 +00:00
Dag-Erling Smørgrav
726edecf4a Remove debugging output (perforce change #32378) 2003-06-02 15:04:15 +00:00
Dag-Erling Smørgrav
873e44709d This commit was generated by cvs2svn to compensate for changes in r115698, 
which included commits to RCS files with non-trunk default branches.
 2003-06-02 15:04:15 +00:00
Dag-Erling Smørgrav
31c521e9ea Vendor import of OpenPAM Digitalis. 2003-06-01 12:54:03 +00:00
Dag-Erling Smørgrav
c62cf40c3e This commit was generated by cvs2svn to compensate for changes in r115619, 
which included commits to RCS files with non-trunk default branches.
 2003-06-01 12:54:03 +00:00
Martin Blapp
fe0dbd7088 Use non-blocking mode for amd(8) too. The fix will be part 
of the next amd(8) snap.

Reviewed by:	rwatson
Approved by:	re
Obtained from:	NetBSD
 2003-05-29 09:18:22 +00:00
Martin Blapp
0022867d24 This commit was generated by cvs2svn to compensate for changes in r115379, 
which included commits to RCS files with non-trunk default branches.
 2003-05-29 09:18:22 +00:00
David E. O'Brien
34d258e905 From FSF Binutils CVS repo: 
2003-04-09  Richard Henderson  <rth@redhat.com>
	* elf64-alpha.c (elf64_alpha_relocate_section) <R_ALPHA_GPREL32>:
	Ignore relocations against r_symndx == 0.

Requested by:	kris,re(scottl)
 2003-05-28 03:32:33 +00:00
Ruslan Ermilov
3fc8056a59 Apply a vendor fix for one problem with tagged lists. From ChangeLog: 
2003-05-18  Werner LEMBERG  <wl@gnu.org>
        * tmac/doc.tmac (doc-tag-list): Force horizontal mode after tag
        to make items work which consist only of a tag.

2003-05-17  Werner LEMBERG  <wl@gnu.org>
        * tmac/doc.tmac (doc-tag-list): Don't use \Z to assure that spaces
        aren't stretched in a tag (this can fail with unformatted boxes).
        Instead, insert a break and go back one line.

Approved by:	re (blanket)
 2003-05-19 14:37:41 +00:00
Ruslan Ermilov
e5b4d90497 This commit was generated by cvs2svn to compensate for changes in r115155, 
which included commits to RCS files with non-trunk default branches.
 2003-05-19 14:37:41 +00:00
Mark Murray
074e8e8ee9 Fix up external variables named "debug" that have a horrible habit 
of conflicting with other, similarly named functions in static
libraries. This is done mostly by renaming the var if it is shared
amongst modules, or making it static otherwise.

OK'ed by:	re(scottl)
 2003-05-11 18:17:00 +00:00
David E. O'Brien
f8f4e47610 I goofed in rev 1.59 (a.out support axing) and missed getting FUNCTION_PROFILER 
fully clean.  This resulted in inserted garbage into the produced assembly code
when the gcc -pg and -fPIC options are used together.

PR:		i386/50598
Submitted by:	Don Lewis <truckman@freebsd.org>
 2003-05-08 16:02:22 +00:00
David E. O'Brien
8d5c19ffbc Centralize _PATH_* definitions. 
Submitted by:	Tim Kientzle <kientzle@acm.org> (embellished by me)
 2003-05-05 22:49:23 +00:00
David E. O'Brien
77b7cdf199 Use __FBSDID vs. rcsid[]. Also protect sccs[] and copyright[] from GCC 3.3. 2003-05-04 02:54:49 +00:00
Ruslan Ermilov
567296d467 MFV: 
- Do not emit multiple empty lines in the CRT mode.
- Fixed the Nd macro to use the right dash.
 2003-05-03 22:02:44 +00:00
Ruslan Ermilov
65b4847f6c A couple of vendor updates: 
2003-05-01  Werner LEMBERG  <wl@gnu.org>

        * tmac/doc-ditroff, tmac/doc-nroff (doc-header-space,
        doc-footer-space): Initialize to 0.5i.
        (doc-setup-page-layout): Don't set doc-header-space and
        doc-footer-space.

2003-05-01  Ruslan Ermilov  <ru@FreeBSD.org>

        * tmac/doc-common (Nd): Use \[em].

2003-05-03  Werner LEMBERG  <wl@gnu.org>

        * tmac/doc-common (doc-header): Emit vertical space of 1v instead of
        `doc-header-space' after header line if register `cR' is set.
 2003-05-03 21:54:30 +00:00
David E. O'Brien
c04949c564 The author wanted stringification, not concatenation. 2003-05-03 19:22:47 +00:00
Dag-Erling Smørgrav
4cb68ea5f3 Vendor import of OpenPAM Dianthus. 2003-05-02 15:08:06 +00:00
Dag-Erling Smørgrav
d560ce1f34 This commit was generated by cvs2svn to compensate for changes in r114536, 
which included commits to RCS files with non-trunk default branches.
 2003-05-02 15:08:06 +00:00
Ruslan Ermilov
ef584f5de1 Update for version 4.5 import. 2003-05-02 01:00:41 +00:00
Ruslan Ermilov
bc0a8ef662 Update for texinfo 4.5. 2003-05-02 00:51:24 +00:00
Ruslan Ermilov
854bdcd67c Merge texinfo 4.5 changes onto the trunk. 2003-05-02 00:50:59 +00:00
Ruslan Ermilov
1226daebc6 Use stock (FSF) version of this file. 2003-05-02 00:50:37 +00:00
Ruslan Ermilov
13885d9a55 Removed files not present in v4.5 import. 2003-05-02 00:49:43 +00:00
Ruslan Ermilov
09ddbe20b3 This commit was generated by cvs2svn to compensate for changes in r114475, 
which included commits to RCS files with non-trunk default branches.
 2003-05-02 00:49:43 +00:00
Ruslan Ermilov
a889f1983f Import of stripped down GNU texinfo 4.5 2003-05-02 00:48:41 +00:00
Ruslan Ermilov
51c84d8830 This commit was generated by cvs2svn to compensate for changes in r114472, 
which included commits to RCS files with non-trunk default branches.
 2003-05-02 00:48:41 +00:00
Ruslan Ermilov
157cd280a4 Update upgrade instructions. 2003-05-01 21:28:49 +00:00
Dag-Erling Smørgrav
63303d4131 Initialize variables (perforce change #30310) 2003-05-01 17:16:48 +00:00
Dag-Erling Smørgrav
234f2972e9 This commit was generated by cvs2svn to compensate for changes in r114438, 
which included commits to RCS files with non-trunk default branches.
 2003-05-01 17:16:48 +00:00
Dag-Erling Smørgrav
740d6dcde7 Initialize dlh (perforce change #30312) 2003-05-01 17:15:45 +00:00
Dag-Erling Smørgrav
ce0481eab7 This commit was generated by cvs2svn to compensate for changes in r114436, 
which included commits to RCS files with non-trunk default branches.
 2003-05-01 17:15:45 +00:00
Ruslan Ermilov
200adcaa58 Merge local changes (8 bit clean ctype support) onto mainline. 2003-05-01 13:18:55 +00:00
Ruslan Ermilov
1876a79222 Merge Groff 1.19 changes. 2003-05-01 13:18:29 +00:00
Ruslan Ermilov
9c9e6eb0f0 Use stock (FSF) version of this file. 2003-05-01 13:17:56 +00:00
Ruslan Ermilov
616835c78d Removed yacc(1) output files. 2003-05-01 13:17:18 +00:00
Ruslan Ermilov
21acd3a2ac Removed files not present in v1.19 import. 2003-05-01 13:15:22 +00:00
Ruslan Ermilov
6424653b3f This commit was generated by cvs2svn to compensate for changes in r114405, 
which included commits to RCS files with non-trunk default branches.
 2003-05-01 13:15:22 +00:00
Ruslan Ermilov
711bc52bd8 Removed files not present in v1.19 import. 2003-05-01 13:15:22 +00:00
Ruslan Ermilov
bdbe8a18ed Virgin import of FSF groff v1.19 2003-05-01 13:09:50 +00:00
Ruslan Ermilov
142a1fb87f This commit was generated by cvs2svn to compensate for changes in r114402, 
which included commits to RCS files with non-trunk default branches.
 2003-05-01 13:09:50 +00:00
David E. O'Brien
a12d8aed9a We're changing the platform name from x86[_-]86 to amd64. 2003-04-26 20:04:38 +00:00
David E. O'Brien
1143283a26 Fix the LINK_SPEC. Our i386 32-bit emulation name changed. 
We also need to look in the proper directory for 32-bit libs.
 2003-04-26 19:20:25 +00:00
David E. O'Brien
9ad1907230 Remove the last vestiges (I hope) of the mixed ELF/a.out support. 
As a plus we can use the stock CC1_SPEC and ASM_SPEC for AMD64.
 2003-04-26 19:16:54 +00:00
Alexander Kabaev
f6a013dc14 Teach gcc how to put unitialized data into BSS on FreeBSD. 2003-04-13 01:04:01 +00:00
Tim J. Robbins
81b431dba3 Fix a typo in the -O parsing code that caused a crash when the -O option 
is used without supplying "sowner:sgroup".

Obtained from:	NetBSD (jdolecek)
PR:		37171
 2003-04-12 12:11:14 +00:00
David Schultz
6836976246 Add some missing prototypes to eliminate some warnings. These already 
appear without leading underscores in gdtoa.h, but this approach avoids
removing that file from the vendor branch and unduly rearranging things.

Prodded by:	nectar
 2003-04-09 06:04:35 +00:00
David Schultz
628f583ce9 Add missing prototype for gdtoa(). 2003-04-05 22:09:26 +00:00
Darren Reed
6ad5053781 update man page to reflect change in default syslog level ipmon is now compiled with 2003-04-05 21:12:58 +00:00
Darren Reed
3987f181d5 Change the default syslog facility from LOG_LOCAL0 to LOG_SECURITY after 
discussion on security@freebsd.org.
 2003-04-05 09:25:19 +00:00
Gregory Neil Shapiro
2af5e4d96f sendmail 8.12.9 has been imported 2003-03-29 19:21:28 +00:00
Gregory Neil Shapiro
729362425c Fix conflicts from sendmail 8.12.9 import 2003-03-29 19:18:07 +00:00
Gregory Neil Shapiro
5ef517c097 Import sendmail 8.12.9 2003-03-29 19:12:53 +00:00
Gregory Neil Shapiro
77b53d4402 This commit was generated by cvs2svn to compensate for changes in r112810, 
which included commits to RCS files with non-trunk default branches.
 2003-03-29 19:12:53 +00:00
Alexander Kabaev
fabd8bcd49 Remove files incidentally imported from the wrong place during 
3.2.1 import. They are not used by any of our system GCC versions
and will be physically removed from repository soon.

Reviewed by:	obrien
 2003-03-26 18:12:01 +00:00
Alexander Kabaev
0c0bdf85fa This commit was generated by cvs2svn to compensate for changes in r112680, 
which included commits to RCS files with non-trunk default branches.
 2003-03-26 18:12:01 +00:00
David Schultz
ec3a1a66aa This commit was generated by cvs2svn to compensate for changes in r112620, 
which included commits to RCS files with non-trunk default branches.
 2003-03-25 17:55:07 +00:00
David Schultz
8f7c2af436 Import new sources. The only material change in this update is to 
add locale support for hexadecimal floating point conversions.

Noticed by:	ache
Reviewed by:	mike (mentor)
 2003-03-25 17:55:07 +00:00
Martin Blapp
b0f74fbd3a We don't have cat(1) and kill(1) on the miniroot disks. 
This fix will be committed to the ISC repo later, but for now
take this file out of the vendor tree.

Reviewed by:	phk
Approved by:	murray
 2003-03-23 23:29:36 +00:00
Dag-Erling Smørgrav
b5bd3dd547 Add support for OpenBSD extensions to the $CVSROOT/config syntax. 
Approved by:	peter
Obtained from:	OpenBSD
 2003-03-20 11:05:48 +00:00
David Schultz
1dd3a3db1d Enable locale support in strtod() and dtoa(). 
Noticed by:	ache
Reviewed by:	mike (mentor)
 2003-03-19 20:25:45 +00:00
David Schultz
84781d47e6 Import gdtoa sources dated 20030318, which contain several locale fixes. 
Reviewed by:	mike (mentor)
 2003-03-19 20:23:29 +00:00
David Schultz
e8b59c3f5d This commit was generated by cvs2svn to compensate for changes in r112415, 
which included commits to RCS files with non-trunk default branches.
 2003-03-19 20:23:29 +00:00
David E. O'Brien
ae573770aa Add a -v(erbose) flag to undo our -q(uiet) default. 2003-03-18 19:46:55 +00:00
David E. O'Brien
fc6b1dfe95 Vendor import of bwk's 14-March-2003 release. 2003-03-17 07:59:59 +00:00
David E. O'Brien
3a147e6d81 This commit was generated by cvs2svn to compensate for changes in r112336, 
which included commits to RCS files with non-trunk default branches.
 2003-03-17 07:59:59 +00:00
David Schultz
de9840c6e5 Local patches: 
- include extra system headers and add appropriate #defines
- use a spinlock to synchronize parts of gdtoa
- protect exported symbols with leading underscores

Reviewed by:	bde (briefly), mike (mentor), obrien
 2003-03-12 20:20:22 +00:00
David Schultz
cc36ccd13b Initial import of David Gay's gdtoa library for conversion between 
strings and floating point.
 2003-03-12 20:18:32 +00:00
David Schultz
19a59cf3b3 This commit was generated by cvs2svn to compensate for changes in r112158, 
which included commits to RCS files with non-trunk default branches.
 2003-03-12 20:18:32 +00:00
John Polstra
020e34e445 Fixes for the Russian translations of the messages. 
PR:		bin/48035, bin/48036
Submitted by:	Sergey A.Osokin <osa@FreeBSD.org.ru>
Reviewed by:	ache
MFC after:	4 weeks
 2003-03-08 22:45:12 +00:00
Jacques Vidrine
81d1ffee08 Unbreak Kerberos 5 authentication in telnet. 
(Credential forwarding is still broken.)

PR:	bin/45397
 2003-03-06 13:41:53 +00:00
Gregory Neil Shapiro
8f755de4a6 sendmail 8.12.8 has been imported 2003-03-03 17:25:49 +00:00
Gregory Neil Shapiro
f9218d3d4f Fix conflicts from sendmail 8.12.8 import 2003-03-03 17:18:01 +00:00
Gregory Neil Shapiro
d9986b26e6 Import sendmail 8.12.8 2003-03-03 17:09:13 +00:00
Gregory Neil Shapiro
bdf8df5292 This commit was generated by cvs2svn to compensate for changes in r111823, 
which included commits to RCS files with non-trunk default branches.
 2003-03-03 17:09:13 +00:00
David E. O'Brien
78ffae804d This commit was generated by cvs2svn to compensate for changes in r111756, 
which included commits to RCS files with non-trunk default branches.
 2003-03-02 19:10:30 +00:00
Bill Fenner
0e0def197a Merge tcpdump 3.7.2 2003-03-02 08:25:48 +00:00
Bill Fenner
e32fdc8718 This commit was generated by cvs2svn to compensate for changes in r111726, 
which included commits to RCS files with non-trunk default branches.
 2003-03-02 08:22:26 +00:00
Bill Fenner
9afd0c2902 Import tcpdump 3.7.2 (fudging for multi-DLT support) from 
http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz
 2003-03-02 08:22:26 +00:00
David E. O'Brien
93f0e9c64d This commit was generated by cvs2svn to compensate for changes in r111658, 
which included commits to RCS files with non-trunk default branches.
 2003-02-28 05:19:36 +00:00
David E. O'Brien
490143648c Virgin import of Christos Zoulas's FILE 3.41. 
* - fix memory allocation problem (Jeff Johnson)
	* - fix stack overflow corruption (David Endler)
 2003-02-28 05:19:36 +00:00
Gregory Neil Shapiro
e0e1e2d0a3 Follow the (good) trend of returning import files to vendor versions 
where possible for easier future imports.
 2003-02-23 21:58:16 +00:00
Gregory Neil Shapiro
a153c1fc66 This local FreeBSD mod isn't needed now that we have the freebsd* ostype 
files.
 2003-02-23 21:53:16 +00:00
Dag-Erling Smørgrav
83a75cff45 MFP4: guard against null pointer dereference which sshd can cause (#25271) 2003-02-16 11:28:55 +00:00
Dag-Erling Smørgrav
3663322d8a This commit was generated by cvs2svn to compensate for changes in r110989, 
which included commits to RCS files with non-trunk default branches.
 2003-02-16 11:28:55 +00:00
David E. O'Brien
3459dd3784 Virgin import of Christos Zoulas's FILE 3.40. 2003-02-15 18:53:17 +00:00
David E. O'Brien
cb88de0913 This commit was generated by cvs2svn to compensate for changes in r110949, 
which included commits to RCS files with non-trunk default branches.
 2003-02-15 18:53:17 +00:00
Darren Reed
57e3d9cf76 bring changes in IPFilter to 3.4.31 on to the head 2003-02-15 06:32:48 +00:00
Darren Reed
965575f97c Import userland tools for IPFilter 3.4.31 into -current 2003-02-15 06:27:40 +00:00
Darren Reed
50d563d31c This commit was generated by cvs2svn to compensate for changes in r110917, 
which included commits to RCS files with non-trunk default branches.
 2003-02-15 06:27:40 +00:00
Ruslan Ermilov
8a88a4255f Use the stock (FSF) version of this file. 2003-02-14 13:44:04 +00:00
Ruslan Ermilov
6a5c53e7a2 Moved the libugidfw library definition out from contributed source 
to where it actually belongs.

Submitted by:	phantom
 2003-02-14 13:36:16 +00:00
Gregory Neil Shapiro
fabecb74aa Import proto.m4 fix from vendor repository. This fixes a cf building 
bug if LOCAL_RELAY and/or MAIL_HUB are used in an mc file.
 2003-02-10 16:41:06 +00:00
Gregory Neil Shapiro
82cd538ed5 This commit was generated by cvs2svn to compensate for changes in r110647, 
which included commits to RCS files with non-trunk default branches.
 2003-02-10 16:41:06 +00:00
Alexander Kabaev
42194a8171 Merge FreeBSD modifications into gcc 3.2.2 release: 
1.8  printf format error fixes.
 2003-02-10 06:07:12 +00:00
Alexander Kabaev
a81f4c40b7 Merge FreeBSD modifications into gcc 3.2.2 release: 
1.10  -mno-align-long-strings.
  1.11  Allow the specification of LONG_TYPE_SIZE on the command line.
 2003-02-10 06:05:16 +00:00
Alexander Kabaev
c66fff0155 Merge FreeBSD modifications into gcc 3.2.2 release: 
1.11  -mno-align-long-strings.
Note the change 1.15 is not needed anymore.
 2003-02-10 06:04:35 +00:00
Alexander Kabaev
6d114ccf45 Update for Gcc 3.2.2 release. 2003-02-10 06:03:47 +00:00
Alexander Kabaev
6f20e984fc Merge FreeBSD modifications into gcc 3.2.2 release: 
1.{2,15}     FREEBSD_NATIVE.
  1.21         "GCC_OPTIONS".
  1.{16,25,27} Cross-compiling issues.
 2003-02-10 06:03:16 +00:00
Alexander Kabaev
42f979319e Merge FreeBSD modifications into gcc 3.2.2 release: 
1.2 -fformat-extensions.
  1.3 -printf0
  1.6 Teach GCC about %y for DDB and implement
      support for the C99 %z format modifier.
 2003-02-10 06:00:24 +00:00
Alexander Kabaev
10a72f72d8 Merge FreeBSD modifications into gcc 3.2.2 release: 
1.2 kernel printf enhancements framework.
  1.3 suppress prototype warnings on K&R main.
 2003-02-10 05:59:19 +00:00
Alexander Kabaev
76c39e5f7b Merge FreeBSD modifications into gcc 3.2.2 release: 
1.2  framework for our kernel printf enhancements.
  1.3  suppress prototype warnings on K&R main.
 2003-02-10 05:58:19 +00:00
Alexander Kabaev
d79e61dc75 Update HEAD with stock GCC 3.2.2 release files. 2003-02-10 05:57:03 +00:00
Alexander Kabaev
2b4726c945 Gcc 3.2.2-release libf2c bits. 2003-02-10 05:49:31 +00:00
Alexander Kabaev
2b69e56ae8 This commit was generated by cvs2svn to compensate for changes in r110618, 
which included commits to RCS files with non-trunk default branches.
 2003-02-10 05:49:31 +00:00
Alexander Kabaev
c8f8cd6da1 Gcc 3.2.2-release Objective C support bits. 2003-02-10 05:48:28 +00:00
Alexander Kabaev
3522eb4638 This commit was generated by cvs2svn to compensate for changes in r110616, 
which included commits to RCS files with non-trunk default branches.
 2003-02-10 05:48:28 +00:00
Alexander Kabaev
61e268fb5f Gcc 3.2.2-release C++ support bits. 2003-02-10 05:47:54 +00:00
Alexander Kabaev
5801dade0e This commit was generated by cvs2svn to compensate for changes in r110614, 
which included commits to RCS files with non-trunk default branches.
 2003-02-10 05:47:54 +00:00
Alexander Kabaev
7b74929d74 Gcc 3.2.2-release. 2003-02-10 05:41:50 +00:00
Alexander Kabaev
72983f38e1 This commit was generated by cvs2svn to compensate for changes in r110611, 
which included commits to RCS files with non-trunk default branches.
 2003-02-10 05:41:50 +00:00
Gregory Neil Shapiro
856417ebfd Update for sendmail 8.12.7 import 2003-02-08 20:36:52 +00:00
Gregory Neil Shapiro
2ef40764f0 Resolve conflicts from sendmail 8.12.7 import 2003-02-08 20:35:51 +00:00
Gregory Neil Shapiro
13bd19636b Import sendmail 8.12.7 2003-02-08 20:31:29 +00:00
Gregory Neil Shapiro
9e80f49658 This commit was generated by cvs2svn to compensate for changes in r110560, 
which included commits to RCS files with non-trunk default branches.
 2003-02-08 20:31:29 +00:00
Dag-Erling Smørgrav
f3ea2ebc1b MFP4: return the actual value of the requested variable (#24840) 2003-02-08 20:19:10 +00:00
Dag-Erling Smørgrav
d83d846790 This commit was generated by cvs2svn to compensate for changes in r110558, 
which included commits to RCS files with non-trunk default branches.
 2003-02-08 20:19:10 +00:00
Dag-Erling Smørgrav
60f020541d MFP4: avoid side effects in macro arguments (#24823) 2003-02-08 20:18:25 +00:00
Dag-Erling Smørgrav
cf5f7aff8f This commit was generated by cvs2svn to compensate for changes in r110556, 
which included commits to RCS files with non-trunk default branches.
 2003-02-08 20:18:25 +00:00
Gregory Neil Shapiro
518536da5d Even if biff is turned off, we still need to set curoff as the code 
uses that if there is an error writing to the mailbox.  Note this bug
is only in the FreeBSD code, not the vendor code (which doesn't offer
nobiff).

PR:		misc/43392
MFC after:	3 days
 2003-02-08 19:25:21 +00:00
Dag-Erling Smørgrav
b511bdf31c Sync with P4. Most of this is debugging code; the only substantial changes 
are improvements to openpam_{borrow,restore}_cred() (#24779 and #24780).
 2003-02-07 15:27:03 +00:00
Dag-Erling Smørgrav
5d45af4c1e This commit was generated by cvs2svn to compensate for changes in r110503, 
which included commits to RCS files with non-trunk default branches.
 2003-02-07 15:27:03 +00:00
David E. O'Brien
b06b4b9181 Merge our rev 1.2 PAM support into 'nbsd_20030122'. 2003-02-02 21:03:28 +00:00
David E. O'Brien
2b0ee2c16b This commit was generated by cvs2svn to compensate for changes in r110242, 
which included commits to RCS files with non-trunk default branches.
 2003-02-02 20:58:44 +00:00
David E. O'Brien
fc25b5d977 Import of LukeM's ftpd taken from the NetBSD CVS repo on 22-Jan-2003. 
This includes the DoS fix of rev 1.133 libexec/ftpd/ftpd.c.
 2003-02-02 20:58:44 +00:00
Warner Losh
e4c33f456e -kthread has been dead these many years. This PR has languished for a 
long time.  Go ahead and commit the patch since a co-worker has been
working up a code patch in this area and wondered why it hasn't been
committed yet.

PR: 35800
 2003-02-01 18:39:32 +00:00
Jacques Vidrine
4b2eaea43f Background: 
When libdes was replaced with OpenSSL's libcrypto, there were a few
 interfaces that the former implemented but the latter did not.  Because
 some software in the base system still depended upon these interfaces,
 we simply included them in our libcrypto (rnd_keys.c).

Now, finally get around to removing the dependencies on these
interfaces.  There were basically two cases:

  des_new_random_key -- This is just a wrapper for des_random_key, and
     these calls were replaced.

  des_init_random_number_generator et. al. -- A few functions were used
     by the application to seed libdes's PRNG.  These are not necessary
     when using libcrypto, as OpenSSL internally seeds the PRNG from
     /dev/random.  These calls were simply removed.

Again, some of the Kerberos 4 files have been taken off the vendor
branch.  I do not expect there to be future imports of KTH Kerberos 4.
 2003-01-29 18:14:29 +00:00
David E. O'Brien
8c5f736449 main() changed its argv declaration, so follow suit in some FBSD added code. 2003-01-29 05:16:58 +00:00
Doug Barton
7f1ab065eb Import of ISC BIND version 8.3.4 2003-01-28 13:09:17 +00:00
Doug Barton
68ec16bb1e This commit was generated by cvs2svn to compensate for changes in r109983, 
which included commits to RCS files with non-trunk default branches.
 2003-01-28 13:09:17 +00:00
Bill Fenner
aa1a4c1370 Merge Multi-DLT support. 2003-01-26 01:23:26 +00:00
Bill Fenner
6121e7f0d2 Merge multi-DLT support. 2003-01-26 01:21:53 +00:00
Bill Fenner
0ccd7b511b Commit tcpdump.org's multi-DLT support to vendor branch. 2003-01-26 01:16:33 +00:00
Bill Fenner
a63efadcf1 This commit was generated by cvs2svn to compensate for changes in r109839, 
which included commits to RCS files with non-trunk default branches.
 2003-01-26 01:16:33 +00:00
Bill Fenner
09f33d614a Commit tcpdump.org's multi-DLT support to vendor branch. 2003-01-26 01:16:33 +00:00
Dag-Erling Smørgrav
1e518e37e8 #include <stddef.h> rather than <sys/types.h> (perforce change 24116) 2003-01-23 21:37:53 +00:00
Dag-Erling Smørgrav
1e6f507f49 This commit was generated by cvs2svn to compensate for changes in r109756, 
which included commits to RCS files with non-trunk default branches.
 2003-01-23 21:37:53 +00:00
Dag-Erling Smørgrav
40ce2f606a #include <sys/types.h> (perforce change 24073) 2003-01-22 16:46:44 +00:00
Dag-Erling Smørgrav
8283fc5283 This commit was generated by cvs2svn to compensate for changes in r109686, 
which included commits to RCS files with non-trunk default branches.
 2003-01-22 16:46:44 +00:00
Dag-Erling Smørgrav
5da7cece45 When computing a new seed for an existing user, opienewseed() would 
incorrectly compute the length of the numeric portion of the previous
seed, causing the new seed to be one character shorter than the old
one.

This patch has been submitted to the vendor; I'm committing it right
away since the file is already off the vendor branch.

MFC after:	3 days
 2003-01-22 10:55:36 +00:00
Peter Wemm
fd98984aaf Turn off Checkin-prog and Update-prog. 2003-01-21 22:10:13 +00:00
Peter Wemm
27e93a05a2 This commit was generated by cvs2svn to compensate for changes in r109661, 
which included commits to RCS files with non-trunk default branches.
 2003-01-21 22:02:26 +00:00
Peter Wemm
9de666118b Merge cvs-1.11.2.1-20021201 -> 1.11.5 changes onto mainline 2003-01-21 22:01:38 +00:00
Peter Wemm
3a7972097e This commit was generated by cvs2svn to compensate for changes in r109658, 
which included commits to RCS files with non-trunk default branches.
 2003-01-21 21:58:47 +00:00
Peter Wemm
67eea7a2ff This commit was generated by cvs2svn to compensate for changes in r109655, 
which included commits to RCS files with non-trunk default branches.
 2003-01-21 21:53:03 +00:00
Peter Wemm
10582a5671 Import cvs-1.11.5 onto vendor branch 2003-01-21 21:53:03 +00:00
Bill Fumerola
a3bb66de04 add more RFC defined telnet options 
Reviewed by:	ps
 2003-01-18 06:10:21 +00:00
Murray Stokely
0b39641ad0 We now include the dhcpctl subdirectory. 2003-01-16 19:05:56 +00:00
David E. O'Brien
4bf463ac4d Update for the isc_dhcp_3_0_1_rc11 import. 2003-01-16 07:53:32 +00:00
David E. O'Brien
f68a4f4923 Use the stock version of this file -- all our needs have been taken care of. 2003-01-16 07:41:43 +00:00
David E. O'Brien
ee0e0df35c Make the "SEE ALSO" suitable for FreeBSD. 2003-01-16 07:36:45 +00:00
David E. O'Brien
6e38cc5509 Make isc_dhcp_3_0_1_rc11's "SEE ALSO" suitable for FreeBSD. 2003-01-16 07:31:49 +00:00
Murray Stokely
e00b76de56 Import ISC DHCP 3.0.1 RC11 omshell interface. 2003-01-16 07:29:37 +00:00
Murray Stokely
fc7a955609 This commit was generated by cvs2svn to compensate for changes in r109365, 
which included commits to RCS files with non-trunk default branches.
 2003-01-16 07:29:37 +00:00
David E. O'Brien
1888ca53cd Merge rev 1.6 (-D) and rev 1.8 (SEE ALSO suitable for FreeBSD) into 
isc_dhcp_3_0_1_rc11.
 2003-01-16 07:28:12 +00:00
David E. O'Brien
cf2acbc3a2 Make isc_dhcp_3_0_1_rc11's "SEE ALSO" suitable for FreeBSD. 2003-01-16 07:23:57 +00:00
David E. O'Brien
bd6635cff2 Merge rev 1.2 (correct script path) and 1.6 (prefer strlcpy to strcpy) 
into isc_dhcp_3_0_1_rc11.
 2003-01-16 07:22:32 +00:00
David E. O'Brien
42f38b97ae Merge our spelling changes into isc_dhcp_3_0_1_rc11. 2003-01-16 07:19:43 +00:00
David E. O'Brien
5ad7270f30 Import isc-dhcpd-3.0.1rc11. 
This fixes a security vulnerability in the bundled resolver library.

Requested by:	scottl(re)
 2003-01-16 07:04:57 +00:00
David E. O'Brien
41f294aba1 This commit was generated by cvs2svn to compensate for changes in r109357, 
which included commits to RCS files with non-trunk default branches.
 2003-01-16 07:04:57 +00:00
Murray Stokely
d4bba2e43d Resolve conflicts. 2003-01-15 10:47:32 +00:00
Murray Stokely
1593a68cca Resolve conflicts. 
(import approved by: re)
 2003-01-15 10:44:05 +00:00
Murray Stokely
8a71375ab6 Import ISC DHCP 3.0.1 RC10 client. 2003-01-15 10:31:26 +00:00
Murray Stokely
20f6de7220 This commit was generated by cvs2svn to compensate for changes in r109298, 
which included commits to RCS files with non-trunk default branches.
 2003-01-15 10:31:26 +00:00
Matthew Dillon
48e3128b34 Bow to the whining masses and change a union back into void *. Retain 
removal of unnecessary casts and throw in some minor cleanups to see if
anyone complains, just for the hell of it.
 2003-01-13 00:33:17 +00:00
Matthew Dillon
cd72f2180b Change struct file f_data to un_data, a union of the correct struct 
pointer types, and remove a huge number of casts from code using it.

Change struct xfile xf_data to xun_data (ABI is still compatible).

If we need to add a #define for f_data and xf_data we can, but I don't
think it will be necessary.  There are no operational changes in this
commit.
 2003-01-12 01:37:13 +00:00
Peter Wemm
dc14fb2388 Add in a patch from tcpdump-current (that will be included in the next 
import) to stop a segfault on ia64.  Add a #include to get missing
prototypes, particularly malloc().

Approved by: fenner
 2003-01-08 22:12:01 +00:00
Peter Wemm
a828a2f58c This commit was generated by cvs2svn to compensate for changes in r108968, 
which included commits to RCS files with non-trunk default branches.
 2003-01-08 22:12:01 +00:00
Peter Wemm
69c9999d0c Add #include <stdlib.h> so that "s->strings = realloc(...)" doesn't segfault 
on ia64.  (This file isn't vendor branched)
 2003-01-08 17:05:52 +00:00
Peter Wemm
cf67b27ecc Add a declaration that malloc() returns a pointer, not an int. Otherwise 
this segfaults on ia64.  (Cannot cast an int to a pointer).
The rest of the code does it this way rather than use system includes....
 2003-01-08 07:02:07 +00:00
Peter Wemm
edf112ec42 Add #include "diff.h" in order to get the prototype for xmalloc(). 
The corresponding warning has been ignored for ages:
  prepend_args.c:75: warning: initialization makes pointer from integer
  without a cast
This is fatal on ia64.  You cannot convert an implicit int return from
an undeclared function to a pointer as you've lost the upper 32 bits.
On ia64, the warning is "pointer from different sized integer".

(This file is not vendor branched)
 2003-01-08 06:40:35 +00:00
David E. O'Brien
259ebc0c95 Add support for OPIE and PAM. 
Submitted by:	mikeh (reworked by me)
 2003-01-07 17:31:23 +00:00
Chris Costello
0f0314e578 Add an entry for libugidfw. 
Sponsored by:	DARPA, Network Associates Laboratories
 2003-01-07 11:30:53 +00:00
Dag-Erling Smørgrav
644f2b7cdc Vendor import of OpenPAM Daffodil. 2003-01-06 16:07:51 +00:00
Dag-Erling Smørgrav
c4f6613446 This commit was generated by cvs2svn to compensate for changes in r108794, 
which included commits to RCS files with non-trunk default branches.
 2003-01-06 16:07:51 +00:00
David E. O'Brien
750bd71121 NetBSD files needed to build LukeM's ftpd src as taken from the NetBSD CVS repo. 
The "portable" release of this is just lagging way too far behind
what is in NetBSD's base.
 2003-01-06 02:26:00 +00:00
David E. O'Brien
94ded79a43 This commit was generated by cvs2svn to compensate for changes in r108760, 
which included commits to RCS files with non-trunk default branches.
 2003-01-06 02:26:00 +00:00
David E. O'Brien
7832db1b05 Merge our .Nm changes into the nbsd_20030105 import. 2003-01-06 00:20:26 +00:00
David E. O'Brien
33bc027019 Import of LukeM's ftpd taken from the NetBSD CVS repo on 5-Jan-2003. 
The "portable" release of this is just lagging way too far behind
what is in NetBSD's base.
 2003-01-06 00:06:49 +00:00
David E. O'Brien
d76fabf464 This commit was generated by cvs2svn to compensate for changes in r108746, 
which included commits to RCS files with non-trunk default branches.
 2003-01-06 00:06:49 +00:00
Dag-Erling Smørgrav
70e94b0be1 Fix typo in debugging macro (perforce change 23072) 2003-01-03 02:18:53 +00:00
Dag-Erling Smørgrav
b97c9ade96 This commit was generated by cvs2svn to compensate for changes in r108577, 
which included commits to RCS files with non-trunk default branches.
 2003-01-03 02:18:53 +00:00
Alexander Kabaev
9361856c8a Fix a bug in GCC which effectively prevents DEFAULT_PCC_STRUCT_RETURN from 
having any effect. This restores a calling convention traditionally used
by FreeBSD/i386 and which is expected by a number of assembly sources
in libc.

Reviewed by:	obrien
Approved by:	re (rwatson)
 2002-12-22 05:57:53 +00:00
David E. O'Brien
edc3fe2db6 Update for the 20021213 version. 2002-12-19 04:34:00 +00:00
David E. O'Brien
72969a2212 Vendor import of bwk's 13-Dec-2002 release. 2002-12-19 04:33:15 +00:00
David E. O'Brien
6825c07db3 This commit was generated by cvs2svn to compensate for changes in r108072, 
which included commits to RCS files with non-trunk default branches.
 2002-12-19 04:33:15 +00:00
Dag-Erling Smørgrav
648199192c Vendor import of OpenPAM Cyclamen. 2002-12-16 15:28:05 +00:00
Dag-Erling Smørgrav
72bb5dc656 This commit was generated by cvs2svn to compensate for changes in r107937, 
which included commits to RCS files with non-trunk default branches.
 2002-12-16 15:28:05 +00:00
Giorgos Keramidas
21fd5cbc92 NetBSD manpages use .Nm "" to typeset the `name' of the manpage, but 
this doesn't work quite right with our groff.  They have an older
groff version in the base system, but no real plans to update both
groff and manpages.  Fix the .Nm usage locally in our manpages.

PR:		docs/41972
Submitted by:	Yoshiteru Kageyama <yt-kage@cb3.so-net.ne.jp>
Discussed with: ru and obrien
 2002-12-14 23:45:54 +00:00
Bill Fenner
83d000df26 Fix misspelling. 
PR:		docs/44930
Submitted by:	Michael McGoldrick <mmcgoldrick@linuxdriven.net>
 2002-12-13 22:26:10 +00:00
David E. O'Brien
9dc9a9b380 Update for the just-done-import. 2002-12-13 05:03:15 +00:00
David E. O'Brien
813da98d0e Vendor import of bwk's 29-Nov-2002 release. 
Most significant update is the inclusion of our port's locale patches.
 2002-12-13 04:59:48 +00:00
David E. O'Brien
cf709e0a4f This commit was generated by cvs2svn to compensate for changes in r107806, 
which included commits to RCS files with non-trunk default branches.
 2002-12-13 04:59:48 +00:00
Ruslan Ermilov
8d5d039f80 Uniformly refer to a file system as "file system". 
Approved by:	re
 2002-12-12 17:26:04 +00:00
David E. O'Brien
ca894c66e0 _NIH, __NIH__, __N_I_H__, __nih__, _niH_. 
*sigh* GCC developers can't seem to make up their mind which pre-defined arch
symbols are the official ones.  So make them, and the Sparc64 using Martians
happy with every permutation.

This fixes f77 and possibly changes some 'long long' handling.

Approved by:	re(bmah)
 2002-12-05 18:40:24 +00:00
David E. O'Brien
b7623b4aba I really hate the GCC directory structure of gcc/gcc/gcc/<compiler files> 2002-12-04 21:31:04 +00:00
David E. O'Brien
e3dd383f00 Gcc 3.2.1 release virgin vendor import. (19-Nov-2002) 2002-12-04 17:08:08 +00:00
David E. O'Brien
8d5a0b4303 This commit was generated by cvs2svn to compensate for changes in r107609, 
which included commits to RCS files with non-trunk default branches.
 2002-12-04 17:08:08 +00:00
David E. O'Brien
8f1134fbb3 Gcc 3.2.1 release virgin vendor import. (19-Nov-2002) 2002-12-04 16:53:59 +00:00
David E. O'Brien
119366edf0 This commit was generated by cvs2svn to compensate for changes in r107606, 
which included commits to RCS files with non-trunk default branches.
 2002-12-04 16:53:59 +00:00
David E. O'Brien
4f471064d9 Update HEAD with FSF branch 3.2.1 release files. 2002-12-04 16:35:55 +00:00
David E. O'Brien
21da7e2bd7 Use pure stock files. 2002-12-04 16:31:48 +00:00
David E. O'Brien
a83e5e4149 Merge rev 1.8 (printf format error fixes) into Gcc 3.2.1 release. 2002-12-04 16:13:54 +00:00
David E. O'Brien
d4053aa61b Gperf is usable again. We don't need this. 2002-12-04 16:13:07 +00:00
David E. O'Brien
2d858acd9b Fix typo to sync with FSF sources. 2002-12-04 16:09:42 +00:00
David E. O'Brien
df53d8649e Merge revs 1.10 (-mno-align-long-strings) and 1.11 (LONG_TYPE_SIZE override) 
into Gcc 3.2.1 release.
 2002-12-04 16:07:58 +00:00
David E. O'Brien
c8bf144918 Merge rev 1.11 (-mno-align-long-strings) into Gcc 3.2.1 release. 2002-12-04 16:04:26 +00:00
David E. O'Brien
4172a45f81 Update for Gcc 3.2.1 release. 2002-12-04 16:01:15 +00:00
David E. O'Brien
991cc708ac Merge revs 1.2 (-fformat-extensions), 1.7 (FORCE_OPTIMIZATION_DOWNGRADE knob), 
1.14 (-O/-O1 optimize alignment for time, not size) into Gcc 3.2.1 release.
 2002-12-04 15:59:56 +00:00
David E. O'Brien
8648049b51 Merge revs 1.{2,15} (FREEBSD_NATIVE); 1.21 ("GCC_OPTIONS"); 1.{16,25,27} 
(cross compiling issues) into GCC 3.2.1 release.

Note revs 1.{5,13} (ELF and objformat support) are OBE with the a.out dike-out.
 2002-12-04 15:57:11 +00:00
David E. O'Brien
cc30d3f890 Merge revs 1.2 (kernel printf framework) and 1.3 (suppress K&R main warnings) 
into Gcc 3.2.1 release.
 2002-12-04 15:48:26 +00:00
David E. O'Brien
45fc31f8dd Gcc 3.2.1 release virgin vendor import. (19-Nov-2002) 2002-12-04 15:42:16 +00:00
David E. O'Brien
908ab21d03 This commit was generated by cvs2svn to compensate for changes in r107590, 
which included commits to RCS files with non-trunk default branches.
 2002-12-04 15:42:16 +00:00
David E. O'Brien
90cbf5083e Gcc 3.2.1 release virgin vendor import. (19-Nov-2002) 2002-12-04 15:15:07 +00:00
David E. O'Brien
2ea5c3f540 This commit was generated by cvs2svn to compensate for changes in r107588, 
which included commits to RCS files with non-trunk default branches.
 2002-12-04 15:15:07 +00:00
Dag-Erling Smørgrav
9c05d469da Add default cases to the switches (perforce change 21902) 2002-12-04 14:37:35 +00:00
Dag-Erling Smørgrav
8c184c9d53 This commit was generated by cvs2svn to compensate for changes in r107579, 
which included commits to RCS files with non-trunk default branches.
 2002-12-04 14:37:35 +00:00
David E. O'Brien
7ec589a9b7 Add spaces around FBSD_ENDFILE_SPEC as it is used in string concatenation. 
Approved by:	re(bmah)
 2002-12-03 04:31:19 +00:00
David E. O'Brien
a46000f2ca Update HEAD with the stock files. 2002-12-02 09:39:02 +00:00
David E. O'Brien
fc91886f96 Merge rev 1.2 (teach `ld' how to access FreeBSD's ld ELF hints) 
into the Binutils 2.13.2 20021128 snap.
 2002-12-02 09:31:42 +00:00
David E. O'Brien
332649695e Remove our custom ELF branding -- we have moved to our own ELF vectors 
that DTRT.
 2002-12-02 09:22:58 +00:00
David E. O'Brien
702c8f15ef Merge our ELF branding into Binutils 2_13_2_20021127 snapshot. 2002-12-02 09:17:49 +00:00
David E. O'Brien
ca88f70eac GC some stuff I thought was long gone. 2002-12-02 09:14:25 +00:00
David E. O'Brien
6c3a332e94 This commit was generated by cvs2svn to compensate for changes in r107492, 
which included commits to RCS files with non-trunk default branches.
 2002-12-02 09:06:04 +00:00
David E. O'Brien
898696a8b3 Import of Binutils from the FSF 2.13 branch (just pre-.2 release). 
These bits are taken from the FSF anoncvs repo on 27-Oct-2002 21:12:00 EST.
 2002-12-02 09:06:04 +00:00
David E. O'Brien
e4c6a19966 Try to keep CVS from pissing over the next binutils import by returning 
to purely stock files.
 2002-12-02 08:42:08 +00:00
Peter Wemm
fada329269 Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainline 
Approved by:	re
 2002-12-02 03:17:49 +00:00
Peter Wemm
6361f125fb Import cvs-1.11.2.1 as of 2002/12/01 onto vendor branch. This fixes all 
of the bugs that I know of.  We've been running a slightly older version
of this on freefall/repoman, where it was afflicted by a silly merge error
on my part (fixed).

Approved by:  re
 2002-12-02 03:13:37 +00:00
Peter Wemm
6711752f92 This commit was generated by cvs2svn to compensate for changes in r107484, 
which included commits to RCS files with non-trunk default branches.
 2002-12-02 03:13:37 +00:00
David E. O'Brien
5f24279c5d Remove files no longer part of the gcc_3_2_anoncvs_20021009 libstdc++. 
Approved by:	re(jhb)
 2002-11-27 18:52:04 +00:00
Eric Melville
0d16d02150 Merge argument parsing changes into this copy of telnet. 
Submitted by:	markm
Approved by:	bmah
 2002-11-27 06:34:24 +00:00
David E. O'Brien
14cb1d2267 Update the version number. 
Approved by:	bmah, jhb, murray (independently)
 2002-11-27 03:36:49 +00:00
David E. O'Brien
f685377c2e Remove our custom mixed ELF/a.out support. This means the base compiler 
now only produce ELF objects.  It also makes us closer to stock GCC, and
simplifies the set of changes we still need from stock GCC on every import.

Applauded by:	peter
Approved by:	re
 2002-11-26 18:25:20 +00:00
Garance A Drosehn
080d74478e Add back the "\ No newline at end of file" marker that is printed when 
comparing two files, where only one file is missing the final newline
character.  This undoes revisions 1.3 and 1.4, returning 'diff' to how
it behaved before July 2000.  We can do this now because our version of
'patch' was modified (just before 4.6-release) to understand what to do
with that line.  This marker is the same one generated by 'diff' under
netbsd, openbsd, darwin, and linux (and any OS with "gnu-diff" installed).

Reviewed by:	imp freebsd-standards (back in april)
Approved by:	re (bmah)
MFC after:	1 week
 2002-11-25 22:59:52 +00:00
Doug Barton
4a43fe6c98 Import security patches from ISC for BIND version 8.3.3 2002-11-14 10:04:51 +00:00
Doug Barton
34c59d2a53 This commit was generated by cvs2svn to compensate for changes in r106907, 
which included commits to RCS files with non-trunk default branches.
 2002-11-14 10:04:51 +00:00
David E. O'Brien
3d982f73f3 Import of LukeM's ftpd version 1.2 Beta 2. 2002-11-12 06:42:39 +00:00
David E. O'Brien
39adcc0fdb This commit was generated by cvs2svn to compensate for changes in r106792, 
which included commits to RCS files with non-trunk default branches.
 2002-11-12 06:42:39 +00:00
David E. O'Brien
81ac040a36 Sync with the stock FSF 3.2 file. This adds TRANSFER_FROM_TRAMPOLINE, 
which is needed in order for nexted C functions to work.
 2002-11-05 03:35:56 +00:00
Ollivier Robert
c9be7fa5ce Merge conflicts. 
MFC after:	1 month
 2002-11-04 19:38:46 +00:00
Ollivier Robert
f8bf23591a This commit was generated by cvs2svn to compensate for changes in r106424, 
which included commits to RCS files with non-trunk default branches.
 2002-11-04 19:36:11 +00:00
Ollivier Robert
ba371819a7 Virgin import of ntpd 4.1.1b 2002-11-04 19:36:11 +00:00