Commit Graph

4188 Commits

Author SHA1 Message Date
Pawel Jakub Dawidek
f0a75d274a Please welcome ZFS - The last word in file systems.
ZFS file system was ported from OpenSolaris operating system. The code in under
CDDL license.

I'd like to thank all SUN developers that created this great piece of software.

Supported by:	Wheel LTD (http://www.wheel.pl/)
Supported by:	The FreeBSD Foundation (http://www.freebsdfoundation.org/)
Supported by:	Sentex (http://www.sentex.net/)
2007-04-06 01:09:06 +00:00
Andrew Thompson
af20afd05a Pull in latest print-stp.c from vendor 2007-04-04 21:17:33 +00:00
Andrew Thompson
f3300398cb This commit was generated by cvs2svn to compensate for changes in r168371,
which included commits to RCS files with non-trunk default branches.
2007-04-04 21:17:33 +00:00
Mark Peek
a5d8788d0d This commit was generated by cvs2svn to compensate for changes in r168305,
which included commits to RCS files with non-trunk default branches.
2007-04-03 15:51:53 +00:00
Mark Peek
4f796ffc7b Import vendor patch to fix postcmd regression in tcsh-6.15.00. 2007-04-03 15:51:53 +00:00
Xin LI
735e7a1ab2 Update with bzip2's URL. 2007-03-30 16:33:05 +00:00
Xin LI
b578e49563 This commit was generated by cvs2svn to compensate for changes in r167984,
which included commits to RCS files with non-trunk default branches.
2007-03-28 07:58:30 +00:00
Xin LI
7e114e8385 Reflect 1.0.4 import. 2007-03-28 07:56:14 +00:00
Xin LI
31d4699f65 This commit was generated by cvs2svn to compensate for changes in r167981,
which included commits to RCS files with non-trunk default branches.
2007-03-28 07:55:07 +00:00
Xin LI
19d9af52da Resolve conflicts. 2007-03-28 07:46:20 +00:00
Xin LI
555470d474 bzip2.c: SA-05:14.bzip2 has been resolved by the author
in a different way.  Make the file just the same as it
is in the vendor branch to make it easier for future
upgrade.
2007-03-28 07:45:41 +00:00
Xin LI
c737bf586a This commit was generated by cvs2svn to compensate for changes in r167974,
which included commits to RCS files with non-trunk default branches.
2007-03-28 07:35:07 +00:00
Xin LI
1b79bae0f8 Virgin import (trimmed) of Bzip2 version 1.0.4. 2007-03-28 07:35:07 +00:00
Xin LI
bdb0aaa123 Resolve conflicts. 2007-03-28 01:57:03 +00:00
Xin LI
c262af8430 This commit was generated by cvs2svn to compensate for changes in r167961,
which included commits to RCS files with non-trunk default branches.
2007-03-28 01:55:49 +00:00
Xin LI
b2f6436d8f Import netcat as of today's OPENBSD_4_1 snapshot. 2007-03-28 01:55:49 +00:00
Mark Peek
15aaece8bd Build updates for tcsh-6.15.00 import.
Reviewed by:	ume
Reminded by:	Divacky Roman
MFC after:	1 week
2007-03-11 22:41:19 +00:00
Mark Peek
45e5710bbb Import of tcsh-6.15.00 2007-03-11 22:33:41 +00:00
Mark Peek
4905cea5f2 This commit was generated by cvs2svn to compensate for changes in r167465,
which included commits to RCS files with non-trunk default branches.
2007-03-11 22:33:41 +00:00
Jung-uk Kim
560a54e10c Add three new ioctl(2) commands for bpf(4).
- BIOCGDIRECTION and BIOCSDIRECTION get or set the setting determining
whether incoming, outgoing, or all packets on the interface should be
returned by BPF.  Set to BPF_D_IN to see only incoming packets on the
interface.  Set to BPF_D_INOUT to see packets originating locally and
remotely on the interface.  Set to BPF_D_OUT to see only outgoing
packets on the interface.  This setting is initialized to BPF_D_INOUT
by default.  BIOCGSEESENT and BIOCSSEESENT are obsoleted by these but
kept for backward compatibility.

- BIOCFEEDBACK sets packet feedback mode.  This allows injected packets
to be fed back as input to the interface when output via the interface is
successful.  When BPF_D_INOUT direction is set, injected outgoing packet
is not returned by BPF to avoid duplication.  This flag is initialized to
zero by default.

Note that libpcap has been modified to support BPF_D_OUT direction for
pcap_setdirection(3) and PCAP_D_OUT direction is functional now.

Reviewed by:	rwatson
2007-02-26 22:24:14 +00:00
Doug Barton
fa5fb0343e Vendor import of BIND 9.3.4 2007-01-29 18:31:57 +00:00
Doug Barton
7df6b04081 This commit was generated by cvs2svn to compensate for changes in r166332,
which included commits to RCS files with non-trunk default branches.
2007-01-29 18:31:57 +00:00
Rong-En Fan
1fe671fed0 Add instructions for future update.
Approved by:	delphij
2007-01-20 08:24:05 +00:00
Rong-En Fan
7d0e8efafb - Resolve conflicts
- Remove files that are removed in vender branch

Approved by:	delphij
2007-01-20 07:39:17 +00:00
Rong-En Fan
2bc3093fdf This commit was generated by cvs2svn to compensate for changes in r166124,
which included commits to RCS files with non-trunk default branches.
2007-01-20 07:32:02 +00:00
Rong-En Fan
4a1a95108d Import ncurses 5.6-20061217 onto the vender branch
Approved by:	delphij
2007-01-20 07:32:02 +00:00
David Schultz
273147031f Merge local diffs. 2007-01-03 04:59:33 +00:00
David Schultz
963e8efffe This commit was generated by cvs2svn to compensate for changes in r165743,
which included commits to RCS files with non-trunk default branches.
2007-01-03 04:58:54 +00:00
David Schultz
c88250a57d Import of the latest gdtoa sources, which include fixes for minor
problems relating to NaNs and rounding.
2007-01-03 04:58:54 +00:00
Andrey A. Chernov
a0c3535536 Udate info after official patch 2006-12-31 09:50:44 +00:00
Andrey A. Chernov
4ccf11657b Merge conflict after official patch 2006-12-31 09:47:34 +00:00
Andrey A. Chernov
ff240e75e9 Merge conflicts 2006-12-31 09:22:31 +00:00
Andrey A. Chernov
7574f7c3cd Update instructions 2006-12-31 09:12:19 +00:00
Andrey A. Chernov
1a568b2363 This commit was generated by cvs2svn to compensate for changes in r165670,
which included commits to RCS files with non-trunk default branches.
2006-12-31 09:06:30 +00:00
Andrey A. Chernov
2661c5c55d Virgin import of GNU Readline 5.2 2006-12-31 09:06:30 +00:00
Ruslan Ermilov
3d4c5c90cb MFV: Sync with vendor branch. 2006-12-25 09:03:10 +00:00
Ruslan Ermilov
16fa9cc022 This commit was generated by cvs2svn to compensate for changes in r165538,
which included commits to RCS files with non-trunk default branches.
2006-12-25 08:59:09 +00:00
Ruslan Ermilov
5bba0737f1 Pull up current -mdoc version from vendor.
- New Darwin, FreeBSD, and NetBSD versions.
- DragonFly support including the new .Dx macro.
- New .St strings: -isoC-amd1, -isoC-tcor1, -isoC-tcor2, and -ieee1275-94.
2006-12-25 08:59:09 +00:00
David E. O'Brien
bc6d91c4b6 Add the '-n' option which is the opposite of '-N', "Do not list tags."
The '-n' option is needed when one has "log -N" in their ~/.cvsrc, but
wishes to see tags for a particular invocation.
2006-12-12 03:20:36 +00:00
Doug Barton
fcb35ad9ef Remove from the vendor branch files that are no longer in the
9.3.3 sources.
2006-12-10 07:12:50 +00:00
Doug Barton
d2bfc051fc This commit was generated by cvs2svn to compensate for changes in r165078,
which included commits to RCS files with non-trunk default branches.
2006-12-10 07:12:50 +00:00
Doug Barton
e99fbbb680 Vendor import of BIND 9.3.3 2006-12-10 07:09:56 +00:00
Doug Barton
06c3b27cdf This commit was generated by cvs2svn to compensate for changes in r165071,
which included commits to RCS files with non-trunk default branches.
2006-12-10 07:09:56 +00:00
Hartmut Brandt
369cca8bf4 This commit was generated by cvs2svn to compensate for changes in r165009,
which included commits to RCS files with non-trunk default branches.
2006-12-08 14:45:15 +00:00
Hartmut Brandt
ca77a23f23 Vendor patch that adds a microsecond timer function. 2006-12-08 14:45:15 +00:00
Giorgos Keramidas
d2d6d8d537 The sigconv.awk script generates a sigdesc.h header file, which
contains a sigdec[] vector of structures, but the generated output is
missing braces around the initializer of each struct, which
triggers warnings in WARNS=3:

src/usr.bin/top/sigdesc.h:10: warning: missing braces around initializer
src/usr.bin/top/sigdesc.h:10: warning: (near initialization for `sigdesc[0]')

  * Fix the sigconv.awk script to generate a header with initializers
    which look better.

  * Add rules to usr.bin/top/Makefile that rebuilds a new sigconv.h
    header which matches the correct signal set from the build-time
    version of `${DESTDIR}/usr/include/signal.h' (so sigconv.h doesn't
    get stale once changes are made to the header).

  * Remove the old sigconv.h header, now that it is autoupdated at
    build time.

  * Various Makefile style fixes (the committed Makefile was kindly
    submitted by Ruslan):

    - Reorder .PATH, PROG, SRCS and CFLAGS to match style.Makefile(5)
    - Split off the generated sources (sigdesc.h top.local.h) in an
      SRCS+= line of their own.
    - Add entries to CLEANFILES near the rules that generate the
      respective files.
    - Move the explicit rule which builds top.1 after the implicit
      rules which generate its dependencies.

Reviewed by:	ru, bde
Submitted by:	ru (Makefile)
MFC after:	2 weeks
2006-12-01 07:01:19 +00:00
Max Laier
e3ae39ac24 From OpenBSD, rev. 1.91:
fix servicecurve check; no point in checking the same sc three times, it
  was obviously intended to check all three. has been wrong since the
  beginning, 4 years... noticed by Earl Lapus <earl.lapus@gmail.com>, Vasil
  Dimov <vd@FreeBSD.org> mailed me then, ok mcbride

MFC after:	3 days
2006-11-30 18:55:36 +00:00
Doug Barton
a02f92e875 Update to version 9.3.2-P2, which addresses the vulnerability
announced by ISC dated 31 October (delivered via e-mail to the
bind-announce@isc.org list on 2 November):

Description:
        Because of OpenSSL's recently announced vulnerabilities
        (CAN-2006-4339, CVE-2006-2937 and CVE-2006-2940) which affect named,
        we are announcing this workaround and releasing patches.  A proof of
        concept attack on OpenSSL has been demonstrated for CAN-2006-4339.

        OpenSSL is required to use DNSSEC with BIND.

Fix for version 9.3.2-P1 and lower:
        Upgrade to BIND 9.3.2-P2, then generate new RSASHA1 and
        RSAMD5 keys for all old keys using the old default exponent
        and perform a key rollover to these new keys.

        These versions also change the default RSA exponent to be
        65537 which is not vulnerable to the attacks described in
        CAN-2006-4339.
2006-11-04 07:53:25 +00:00
Doug Barton
ace7f68b50 This commit was generated by cvs2svn to compensate for changes in r163976,
which included commits to RCS files with non-trunk default branches.
2006-11-04 07:53:25 +00:00
Hartmut Brandt
f56ce4bd26 This commit was generated by cvs2svn to compensate for changes in r163820,
which included commits to RCS files with non-trunk default branches.
2006-10-31 09:00:35 +00:00
Hartmut Brandt
cab70e0247 Vendor patch: synthesize the initial value for sysObjectId from the value
of uname -r in FreeBSD. This value can be overwritten in the configuration
file.

Suggested by:	phk
2006-10-31 09:00:35 +00:00
Hartmut Brandt
f929683df1 Vendor patch: improve readability by using the IF_Mbps macro.
Submitted by:	glebius
2006-10-30 16:56:38 +00:00
Hartmut Brandt
91c878a693 This commit was generated by cvs2svn to compensate for changes in r163799,
which included commits to RCS files with non-trunk default branches.
2006-10-30 16:56:38 +00:00
Max Laier
d6e883fee5 Mention that we do not support route labels in the BUGS section.
PR:		docs/93590
Reported by:	Niki Denev
2006-10-30 15:15:37 +00:00
Bruce Evans
11e27303d3 Fixed -mprofiler-epilogue. The garbage collector apparently doesn't
understand that non-local variables can never be collected, and when
it collected the static variable for mexitcount_libfunc, gcc aborted
on the next use of this variable.

This quick fix is to reinitialize the variable on every use and depend
on garbage collection recovering the small amount of memory wasted by
this, and not worry by the small amount of time wasted by this.  It
would be better to initialize the variable together with most of the
other libfuncs in optabs.c and depend on whatever magic is there to
prevent its collection, but we initialize it here to avoid taking at
least 2 more files off the vendor branch.
2006-10-25 07:29:22 +00:00
David Malone
eac17f2c6f Make it so that the synopsis and usage message almost agree.
MFC after:	3 weeks
2006-10-15 17:44:49 +00:00
David Malone
2f87bd055e Add a -D option to traceroute that prints the differences between
the probe packet we sent and the packet quoted by the ICMP response.
Can be useful for spotting hops that change the packet in-flight
or have problems generating correct ICMP responses.

MFC after:	3 weeks
2006-10-15 17:34:51 +00:00
Ruslan Ermilov
555c9cae3c Fix from upstream: unbreak generation of the terminfo.5 manpage.
PR:		docs/46709, docs/56981, docs/80871
MFC after:	3 days
Obtained from:	ftp://invisible-island.net/ncurses/ncurses-5.5.tar.gz
2006-10-14 19:50:57 +00:00
Ruslan Ermilov
9110424caf This commit was generated by cvs2svn to compensate for changes in r163356,
which included commits to RCS files with non-trunk default branches.
2006-10-14 19:50:57 +00:00
Xin LI
9ba78bf6b1 MFS: Remove file that was disappeared from gcc distribution.
While I'm there, add the file into ObsoleteFiles.inc.

Approved by:	maintainer (kan)
2006-09-30 09:44:58 +00:00
Xin LI
3d556d7a58 This commit was generated by cvs2svn to compensate for changes in r162837,
which included commits to RCS files with non-trunk default branches.
2006-09-30 09:44:58 +00:00
Ruslan Ermilov
a903458081 Markup nits. 2006-09-29 22:51:29 +00:00
Ollivier Robert
3fa694fea6 This commit was generated by cvs2svn to compensate for changes in r162735,
which included commits to RCS files with non-trunk default branches.
2006-09-28 16:02:34 +00:00
Ollivier Robert
8c24a1e0ff Fix compilation with gcc 4.1. This is imported on the vendor branch as it
was applied in the mainstream source and a later complete import of
4.2.2p3 will complete the fix.

Submitted by:	kan
2006-09-28 16:02:34 +00:00
Ruslan Ermilov
eb0fa6f5d7 Remove bogus casts of valid integer ioctl() arguments. 2006-09-26 21:46:12 +00:00
Robert Watson
b9ad4a7bf0 Resolve conflicts from OpenBSM 1.0 alpha 12 import.
Obtained from:	TrustedBSD Project
2006-09-25 11:53:06 +00:00
Robert Watson
4bd0c025f3 Vendor import TrustedBSD OpenBSM 1.0 alpha 12, with the following change
history notes since the last import:

OpenBSM 1.0 alpha 12

- Correct bug in auditreduce which prevented the -c option from working
  correctly when the user specifies to process successful or failed events.
  The problem stemmed from not having access to the return token at the time
  the initial preselection occurred, but now a second preselection process
  occurs while processing the return token.
- getacfilesz(3) API added to read new audit_control(5) filesz setting,
  which auditd(8) now sets the kernel audit trail rotation size to.
- auditreduce(1) now uses stdin if no file names are specified on the command
  line; this was the documented behavior previously, but it was not
  implemented.  Be more specific in auditreduce(1)'s examples section about
  what might be done with the output of auditreduce.
- Add audit_warn(5) closefile event so that administrators can hook
  termination of an audit trail file.  For example, this might be used to
  compress the trail file after it is closed.
- auditreduce(1) now uses regular expressions for pathname matching. Users can
  now supply one or more (comma delimited) regular expressions for searching
  the pathnames. If one of the regular expressions is prefixed with a tilde
  (~), and a path matches, it will be excluded from the search results.

MFC after:	3 days
Obtained from:	TrustedBSD Project
2006-09-25 11:40:29 +00:00
Robert Watson
b3a9bf4df7 This commit was generated by cvs2svn to compensate for changes in r162621,
which included commits to RCS files with non-trunk default branches.
2006-09-25 11:40:29 +00:00
Ruslan Ermilov
f981f1923b Removed these from HEAD as well. 2006-09-21 07:55:28 +00:00
Ruslan Ermilov
89de143f92 These files live in the doc/ subdir in later releases of GCC. 2006-09-21 07:54:02 +00:00
Ruslan Ermilov
5bb8cebbb4 This commit was generated by cvs2svn to compensate for changes in r162512,
which included commits to RCS files with non-trunk default branches.
2006-09-21 07:54:02 +00:00
Ruslan Ermilov
932b1e2fe8 Updated manpages for 3.4.6 release.
OK'ed by:	kan
Obtained from:	gcc-3.4.6.tar.bz2
2006-09-21 07:45:37 +00:00
Ruslan Ermilov
83cc3b492f This commit was generated by cvs2svn to compensate for changes in r162509,
which included commits to RCS files with non-trunk default branches.
2006-09-21 07:45:37 +00:00
Robert Watson
5bf75b12ba Update config.h for OpenBSM 1.0 alpha 11 import: strlcat is now detected
by configure.
2006-09-21 07:14:41 +00:00
Robert Watson
2a62e5451b Resolve conflicts from OpenBSM 1.0 alpha 11 vendor import: we have locally
added $FreeBSD$ to /etc configuration files to assist mergemaster.
2006-09-21 07:12:33 +00:00
Robert Watson
bb97b41819 Vendor import of OpenBSM 1.0 alpha 11, with the following change history
notes since the last import:

OpenBSM 1.0 alpha 11

- Reclassify certain read/write operations as having no class rather than the
  fr/fw class; our default classes audit intent (open) not operations (read,
  write).
- Introduce AUE_SYSCTL_WRITE event so that BSD/Darwin systems can audit reads
  and writes of sysctls as separate events.  Add additional kernel
  environment and jail events for FreeBSD.
- Break AUDIT_TRIGGER_OPEN_NEW into two events, AUDIT_TRIGGER_ROTATE_USER
  (issued by the user audit(8) tool) and AUDIT_TRIGGER_ROTATE_KERNEL (issued
  by the kernel audit implementation) so that they can be distinguished.
- Disable rate limiting of rotate requests; as the kernel doesn't retransmit
  a dropped request, the log file will otherwise grow indefinitely if the
  trigger is dropped.
- Improve auditd debugging output.
- Fix a number of threading related bugs in audit_control file reading
  routines.
- Add APIs au_poltostr() and au_strtopol() to convert between text
  representations of audit_control policy flags and the flags passed to
  auditon(A_SETPOLICY) and retrieved from auditon(A_GETPOLICY).
- Add API getacpol() to return the 'policy:' entry from audit_control, an
  extension to the Solaris file format to allow specification of policy
  persistent flags.
- Update audump to print the audit_control policy field.
- Update auditd to read the audit_control policy field and set the kernel
  policy to match it when configuring/reconfiguring.  Remove the -s and -h
  arguments as these policies are now set via the configuration file.  If a
  policy line is not found in the configuration file, continue with the
  current default of setting AUDIT_CNT.
- Fix bugs in the parsing of large execve(2) arguments and environmental
  variable tokens; increase maximum parsed argument and variable count.
- configure now detects strlcat(), used by policy-related functions.
- Reference token and record sample files added to test tree.

Obtained from:	TrustedBSD Project
2006-09-21 07:07:33 +00:00
Robert Watson
55b15aaa25 This commit was generated by cvs2svn to compensate for changes in r162503,
which included commits to RCS files with non-trunk default branches.
2006-09-21 07:07:33 +00:00
Maxim Konovalov
7585818828 o Mention .telnetrc DEFAULT keyword.
PR:		bin/100496 (sort of)
Obtained from:	NetBSD, heas@netbsd
MFC after:	3 weeks
2006-09-18 15:03:18 +00:00
Ruslan Ermilov
99f3b482da Sort sections. 2006-09-17 18:52:28 +00:00
Ruslan Ermilov
979df1f5dd Remove vestiges of GNU tar. 2006-09-15 08:04:23 +00:00
Doug Barton
42b74b2549 Vendor import of BIND 9.3.2-P1, which addresses the following security
vulnerabilities:

http://www.niscc.gov.uk/niscc/docs/re-20060905-00590.pdf?lang=en
2066.  [security]      Handle SIG queries gracefully. [RT #16300]

http://www.kb.cert.org/vuls/id/697164
1941.  [bug]           ncache_adderesult() should set eresult even if no
                       rdataset is passed to it. [RT #15642]

All users of BIND 9 are encouraged to upgrade to this version.
2006-09-06 21:27:11 +00:00
Doug Barton
ccf118a50a This commit was generated by cvs2svn to compensate for changes in r162079,
which included commits to RCS files with non-trunk default branches.
2006-09-06 21:27:11 +00:00
Sam Leffler
17cb103cb1 resolve merge conflicts
MFC after:	1 month
2006-09-04 20:25:04 +00:00
Sam Leffler
34c97c7db9 sigh, put back buffer overflow fix of 1.1.11 that seems to have
not gone into the 0.9.4 release; don't put it on the vendor branch
so we won't lose it on the next import if they continue to lose it
2006-09-04 20:12:45 +00:00
Sam Leffler
2ebc47db5b Import of tcpdump v3.9.4 2006-09-04 20:04:42 +00:00
Sam Leffler
d44c9004ff This commit was generated by cvs2svn to compensate for changes in r162017,
which included commits to RCS files with non-trunk default branches.
2006-09-04 20:04:42 +00:00
Sam Leffler
73c9abba78 update instructions 2006-09-04 19:54:49 +00:00
Sam Leffler
ff252dbedb resolve merge conflicts
MFC after:	1 month
2006-09-04 19:54:21 +00:00
Sam Leffler
47aafbd8f9 This commit was generated by cvs2svn to compensate for changes in r162012,
which included commits to RCS files with non-trunk default branches.
2006-09-04 19:43:23 +00:00
Sam Leffler
5d18909f05 Import of libpcap v0.9.4 2006-09-04 19:43:23 +00:00
Robert Watson
33c207f0e2 Note removal of certain contrib/openbsm/bsm include files from
FreeBSD development branches, they exist only in the vendor branch.

Obtained from:	TrustedBSD Project
2006-09-02 09:56:28 +00:00
Robert Watson
fdb4472c92 Vendor import of OpenBSM 1.0 alpha 10, with the following changes:
- auditd now generates complete audit records for its events, as required for
  application-submitted audit records in the the FreeBSD kernel audit
  implementation.

This also restores contrib/openbsm/bsm/audit_record to the vendor version
after the build fixes previously committed; however, this file is not used
in the build.

Obtained from:	TrustedBSD Project
2006-09-02 09:37:14 +00:00
Robert Watson
ba33e7d9dd This commit was generated by cvs2svn to compensate for changes in r161863,
which included commits to RCS files with non-trunk default branches.
2006-09-02 09:37:14 +00:00
Robert Watson
85feadf62a Back out imp's quick build fix for OpenBSM now that the prototypes and
functions are in sync between the kernel and user space.

This restores bsm_token.c as found in OpenBSM 1.0 alpha 9.
2006-09-01 15:47:07 +00:00
Robert Watson
2965fc7642 This commit was generated by cvs2svn to compensate for changes in r161818,
which included commits to RCS files with non-trunk default branches.
2006-09-01 15:47:07 +00:00
Robert Watson
8379353c85 Remove duplicated include files from HEAD that appear in both
contrib/openbsm/bsm and sys/bsm.  This will help avoid triggering
problems due to an inconsistent include order between the base and
lib32 builds.  We will continue to import these files on the vendor
branch.  Files used purely in user space (audit_uevents.h) are not
removed.

Suggested by:	ru
2006-09-01 04:58:39 +00:00
David E. O'Brien
67f52b8478 Pull vendor file to HEAD. 2006-08-31 17:11:46 +00:00
David E. O'Brien
c731f591cc Merge in OPIE support, and MAC support.
Our PAM and LOGIN_CAP support is now in the stock sources.
2006-08-31 17:08:21 +00:00
David E. O'Brien
0b2314893a This commit was generated by cvs2svn to compensate for changes in r161764,
which included commits to RCS files with non-trunk default branches.
2006-08-31 16:55:08 +00:00
David E. O'Brien
a5a1d5d318 Import of LukeM's ftpd taken from the NetBSD CVS repo on 31-Aug-2006.
+ Add PAM and LOGIN_CAP support. Mostly from FreeBSD.
+ Implement option "-D", for running ftpd in standalone mode (daemon).
+ NLST should return 450 instead of 550 upon error, per RFC 959.
+ Add recvbufsize configuration option
+ Remove unreachable code (res could never be NULL here), Coverity CID 712.
+ Set file to NULL after calling fclose(), Coverity CID 2669.
+ Make sure that "su" is initialized before dereferencing it, Coverity CID 1075.
+ Cleanup utmp and utmpx support.
2006-08-31 16:55:08 +00:00
Warner Losh
58178f6693 Import on vendor branch two files that have been tweaked to unbreak
the build.  The openbsm folks are free to fix it in any other way they
see fit once they resurface.

Basically, make everything always be const char **, even though const
char ** usually should be 'const char * const *' in most cases.  This
makes the three different definitions consistant and allows world to
build.
2006-08-28 17:26:38 +00:00
Warner Losh
cd437e7ec6 This commit was generated by cvs2svn to compensate for changes in r161701,
which included commits to RCS files with non-trunk default branches.
2006-08-28 17:26:38 +00:00
Alexander Kabaev
f2d5255ddd Resolve conflicts after GCC 3.4.6 20060825 import. 2006-08-26 21:37:21 +00:00
Alexander Kabaev
f2cac1a375 Gcc 3.4.6 F77 runtime support bits (as of 2006/08/25 #116475).
.
2006-08-26 21:30:30 +00:00
Alexander Kabaev
837e5b8c9e This commit was generated by cvs2svn to compensate for changes in r161657,
which included commits to RCS files with non-trunk default branches.
2006-08-26 21:30:30 +00:00
Alexander Kabaev
daf06f0cae Gcc 3.4.6 Objective C support bits (as of 2006/08/25 #116475). 2006-08-26 21:30:26 +00:00
Alexander Kabaev
de43f31a28 This commit was generated by cvs2svn to compensate for changes in r161655,
which included commits to RCS files with non-trunk default branches.
2006-08-26 21:30:26 +00:00
Alexander Kabaev
f482ed056f Gcc 3.4.6 C++ support bits (as of 2006/08/25 #116475). 2006-08-26 21:29:46 +00:00
Alexander Kabaev
04c537677f This commit was generated by cvs2svn to compensate for changes in r161653,
which included commits to RCS files with non-trunk default branches.
2006-08-26 21:29:46 +00:00
Alexander Kabaev
e35cf0a56c Gcc 3.4.6 as of 2006/08/25 #116475. 2006-08-26 21:29:10 +00:00
Alexander Kabaev
35cc3dc5ba This commit was generated by cvs2svn to compensate for changes in r161651,
which included commits to RCS files with non-trunk default branches.
2006-08-26 21:29:10 +00:00
Robert Watson
7932086ef1 Update FreeBSD upgrade notes for OpenBSM.
Obtained from:	TrustedBSD Project
2006-08-26 10:35:54 +00:00
Robert Watson
98c38adbfd Update for OpenBSM 1.0 alpha 9.
Obtained from:	TrustedBSD Project
2006-08-26 08:12:17 +00:00
Robert Watson
505237ac0c Resolove conflicts from OpenBSM 1.0 alpha 9 into audit_event.
Obtained from:	TrustedBSD Project
2006-08-26 08:08:47 +00:00
Robert Watson
22ccb20de4 Vendor import of OpenBSM 1.0 alpha 9, with the following change history
notes since the last import:

OpenBSM 1.0 alpha 9

- Rename many OpenBSM-specific constants and API elements containing the
  strings "BSM" and "bsm" to "AUDIT" and "audit", observing that this is true
  for almost all existing constants and APIs.
- Instead of passing a per-instance cookie directly into all audit filter
  APIs, pass in the audit filter daemon state pointer, which is then used by
  the module using an audit_filter_{get,set}cookie() API.  This will allow
  future service APIs provided by the filter daemon to maintain their own
  state -- for example, per-module preselection state.

OpenBSM 1.0 alpha 8

- Correct typo in definition of AUR_INT.
- Adopt OpenSolaris constant values for AUDIT_* configuration flags.
- Arguments to au_to_exec_args() and au_to_exec_env() no longer const.
- Add kernel versions of au_to_exec_args() and au_to_exec_env().
- Fix exec argument type that is printed for env strings from 'arg' to 'env'.
- New OpenBSM token version number assigned, constants added for other
  commonly seen version numbers.
- OpenBSM-specific events assigned numbers in the 43xxx range to avoid future
  collisions with Solaris.  Darwin events renamed to AUE_DARWIN_foo, as they
  are now deprecated numberings.
- autoconf now detects clock_gettime(), which is not available on Darwin.
- praudit output fixes relating to arg32 and arg64 tokens.
- Maximum record size updated to 64k-1 to match Solaris record size limit.
- Various style and comment cleanups in include files.

This is an MFC candidate to RELENG_6.

Obtained from:	TrustedBSD Project
2006-08-26 08:04:15 +00:00
Robert Watson
c9965e710d This commit was generated by cvs2svn to compensate for changes in r161630,
which included commits to RCS files with non-trunk default branches.
2006-08-26 08:04:15 +00:00
Marcel Moolenaar
929e506f33 Add support for PowerPC. These files are added onto the FSF branch
to avoid future conflicts.
2006-08-24 02:43:20 +00:00
Marcel Moolenaar
92d95d05b3 This commit was generated by cvs2svn to compensate for changes in r161561,
which included commits to RCS files with non-trunk default branches.
2006-08-24 02:43:20 +00:00
Marcel Moolenaar
d5ae8b19e8 Update for PowerPC support. We need to keep rs6000 related files. 2006-08-23 03:30:33 +00:00
Marcel Moolenaar
0ffcd81703 Import files needed for PowerPC support and not included in the
original GDB 6.1.1 import.
2006-08-23 03:28:37 +00:00
Marcel Moolenaar
7eab377589 This commit was generated by cvs2svn to compensate for changes in r161537,
which included commits to RCS files with non-trunk default branches.
2006-08-23 03:28:37 +00:00
Ruslan Ermilov
2b46c64c9c Remove alpha left-overs. 2006-08-22 08:03:01 +00:00
Xin LI
89dd99dcac Resolve conflicts. 2006-08-20 15:50:51 +00:00
Xin LI
6dcb072b30 Import less v394 2006-08-20 15:49:51 +00:00
Xin LI
8978d559b1 This commit was generated by cvs2svn to compensate for changes in r161475,
which included commits to RCS files with non-trunk default branches.
2006-08-20 15:49:51 +00:00
Gregory Neil Shapiro
ce49de0077 Update to sendmail 8.13.8 2006-08-17 05:16:15 +00:00
Gregory Neil Shapiro
3a3ef73d37 Import sendmail 8.13.8 2006-08-17 05:10:43 +00:00
Gregory Neil Shapiro
37ae5ffeb0 This commit was generated by cvs2svn to compensate for changes in r161389,
which included commits to RCS files with non-trunk default branches.
2006-08-17 05:10:43 +00:00
Guido van Rooij
dac098f2c9 Resolve conflicts
MFC after:	1 weeks
2006-08-16 12:23:02 +00:00
Guido van Rooij
4e39c44e09 Import IP Filter 4.1.13 2006-08-16 11:51:32 +00:00
Guido van Rooij
2b8b5c44fc This commit was generated by cvs2svn to compensate for changes in r161351,
which included commits to RCS files with non-trunk default branches.
2006-08-16 11:51:32 +00:00
Giorgos Keramidas
2f934d3e27 Spell 'connection options' correctly.
Submitted by:	  Leonidas Tsampros <ltsampros@upnet.gr>
2006-08-11 12:35:22 +00:00
Colin Percival
fb4bfeb31e Add note concerning FreeBSD-SA-06:01.texindex.
Suggested by:	csjp
2006-07-08 07:32:41 +00:00
Robert Watson
1727deefa8 Resolve conflicts from OpenBSM 1.0 alpha 7 import.
Obtained from:	TrustedBSD Project
2006-06-27 18:09:54 +00:00
Robert Watson
d9af45c4c8 Vendor import of OpenBSM 1.0 alpha 7, with the following change history
notes:

- Adopted Solaris-compatible format for subject32_ex and subject64_ex
  tokens, which previously did not correctly implement variable length
  address storage.
- Prefer inttypes.h to stdint.h; enhance queue.h detection to test for
  TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not
  older ones.  OpenBSM now builds on some FreeBSD 4.x version.
- New event types for extended attributes, ACLs, and scheduling.

Obtained from:	TrustedBSD Project
2006-06-27 18:06:41 +00:00
Robert Watson
258cc56708 This commit was generated by cvs2svn to compensate for changes in r159985,
which included commits to RCS files with non-trunk default branches.
2006-06-27 18:06:41 +00:00
Robert Watson
21b2c802f6 Modify import instructions to include "-n" in the sample command line for
the CVS import, and suggest removing it for the real import, rather than
suggesting it for testing.  This will hopefully prevent me (and others)
from making errors.
2006-06-27 17:55:38 +00:00
David E. O'Brien
dbca37326f Fix segfault when '/etc/malloc.conf@ -> AJ' due to differnce between
calloc & malloc as agreed by vendor.  Also remove an unused variable.
2006-06-21 09:28:00 +00:00
David E. O'Brien
bc4990d51b This commit was generated by cvs2svn to compensate for changes in r159825,
which included commits to RCS files with non-trunk default branches.
2006-06-21 09:28:00 +00:00
David E. O'Brien
35a6917047 Document that 'bad cksum 0' is expected on NICs with checksum off-loading. 2006-06-20 05:04:05 +00:00
David E. O'Brien
838ae103d1 Update for the 'file' 4.17 import. 2006-06-19 07:53:49 +00:00
David E. O'Brien
88a5e5ac7b Virgin import of Christos Zoulas's FILE 4.17. 2006-06-19 07:52:15 +00:00
David E. O'Brien
9c5a4d53e8 This commit was generated by cvs2svn to compensate for changes in r159764,
which included commits to RCS files with non-trunk default branches.
2006-06-19 07:52:15 +00:00
Gregory Neil Shapiro
6945f452cb Update FreeBSD info regarding sendmail 8.13.7 import 2006-06-14 16:33:59 +00:00
Gregory Neil Shapiro
355d91e30e Resolve conflicts from sendmail 8.13.7 import 2006-06-14 16:25:31 +00:00
Gregory Neil Shapiro
af9557fdd1 Import sendmail 8.13.7
Security: FreeBSD-SA-06:17.sendmail
2006-06-14 16:23:02 +00:00
Gregory Neil Shapiro
81623278a5 This commit was generated by cvs2svn to compensate for changes in r159609,
which included commits to RCS files with non-trunk default branches.
2006-06-14 16:23:02 +00:00
David Malone
e4ad3d8dd8 Make traceroute decode all the ICMP unreachable messages defined
in http://www.iana.org/assignments/icmp-parameters. Thankfully
IANA's list aggrees with <netinet/ip_icmp.h>.

I've tried to do this in a way which is mostly consistent with
tcptraceroute and Debian's version of traceroute. However, sometimes
a letter is used twice by these versions, so I've gone with:

                                LBL     tcptr   Debian          (chosen)
ICMP_UNREACH_NET                !N      !N      !N              !N
ICMP_UNREACH_HOST               !H      !H      !H              !H
ICMP_UNREACH_PROTOCOL           !P      !P      !P              !P
ICMP_UNREACH_PORT               !       !p      !               !
ICMP_UNREACH_NEEDFRAG           !F-%d   !F      !F-<%d>         !F-<%d>
ICMP_UNREACH_SRCFAIL            !S      !S      !S              !S
ICMP_UNREACH_NET_UNKNOWN        !<%d>   !U      !<%d>           !U
ICMP_UNREACH_HOST_UNKNOWN       !<%d>   !U      !<%d>           !W
ICMP_UNREACH_ISOLATED           !<%d>   !I      !I              !I
ICMP_UNREACH_NET_PROHIB         !<%d>   !A      !A              !A
ICMP_UNREACH_HOST_PROHIB        !<%d>   !C      !C              !Z
ICMP_UNREACH_TOSNET             !<%d>   !T      !T              !Q
ICMP_UNREACH_TOSHOST            !<%d>   !T      !T              !T
ICMP_UNREACH_FILTER_PROHIB      !X      !A      !A              !X
ICMP_UNREACH_HOST_PRECEDENCE    !V      !<%d>   !V              !V
ICMP_UNREACH_PRECEDENCE_CUTOFF  !C      !<%d>   !C              !C

Graham Wilson is planning to use the same codes in Debian's version.

MFC after:	3 weeks
2006-06-13 14:59:07 +00:00
Marius Strobl
2ce641c5c4 * elf64-sparc.c (sparc64_elf_adjust_dynamic_symbol): When linking a
non-shared object, do not reserve space in .plt and .rela.plt
for regular symbols neither defined nor referenced in shared objects.

This is a backport of rev. 1.101 (sourceware.org repository) to
Binutils 2.15 which fixes the creation of bogus relocations in the
PLT of Firefox and Thunderbird binaries and which in turn caused
them to segfault in rtld(1). This is committed to the vendor branch
as it doesn't represent a local change but the original vendor fix
is from after elf_link_hash_flags was replaced with bitfields.

PR:		sparc64/89486
Approved by:	maintainer timeout
Obtained from:	NetBSD
MFC after:	1 week
2006-06-08 13:10:51 +00:00
Marius Strobl
ef75316994 This commit was generated by cvs2svn to compensate for changes in r159399,
which included commits to RCS files with non-trunk default branches.
2006-06-08 13:10:51 +00:00
Maxim Konovalov
75c0641ed4 o It's lilac-dmc.Berkeley.EDU, not lbl-csam.arpa.
Obtained from:	NetBSD
2006-06-07 21:37:42 +00:00
Gleb Smirnoff
301402accb - Note that the synchronisation interface needs to be up and have
an IP address assigned.
- Add "quick" keyword to pf.conf example.

PR:		docs/85209
2006-06-06 12:35:53 +00:00
Robert Watson
0163f8cb67 Regenerate config.h from OpenBSM 1.0 alpha 6 import.
Obtained from:	TrustedBSD Project
2006-06-05 11:06:32 +00:00
Robert Watson
506764c6f6 Vendor branch import of TrustedBSD OpenBSM 1.0 alpha 6:
- Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close();
  previously we used hard-coded 0 and 1 values.
- Add man page for au_open(), au_write(), au_close(), and
  au_close_buffer().
- Support a more complete range of data types for the arbitrary data token:
  add AUR_CHAR (alias to AUR_BYTE), remove AUR_LONG, add AUR_INT32 (alias
  to AUR_INT), add AUR_INT64.
- Add au_close_token(), which allows writing a single token_t to a memory
  buffer.  Not likely to be used much by applications, but useful for
  writing test tools.
- Modify au_to_file() so that it accepts a timeval in user space, not just
  kernel -- this is not a Solaris BSM API so can be modified without
  causing compatibility issues.
- Define a new API, au_to_header32_tm(), which adds a struct timeval
  argument to the ordinary au_to_header32(), which is now implemented by
  wrapping au_to_header32_tm() and calling gettimeofday().  #ifndef KERNEL
  the APIs that invoke gettimeofday(), rather than having a variable
  definition.  Don't try to retrieve time zone information using
  gettimeofday(), as it's not needed, and introduces possible failure
  modes.
- Don't perform byte order transformations on the addr/machine fields of
  the terminal ID that appears in the process32/subject32 tokens.  These
  are assumed to be IP addresses, and as such, to be in network byte
  order.
- Universally, APIs now assume that IP addresses and ports are provided
  in network byte order.  APIs now generally provide these types in
  network byte order when decoding.
- Beginnings of an OpenBSM test framework can now be found in openbsm/test.
  This code is not built or installed by default.
- auditd now assigns more appropriate syslog levels to its debugging and
  error information.
- Support for audit filters introduced: audit filters are dynamically
  loaded shared objects that run in the context of a new daemon,
  auditfilterd.  The daemon reads from an audit pipe and feeds both BSM and
  parsed versions of records to shared objects using a module API.  This
  will provide a framework for the writing of intrusion detection services.
- New utility API, audit_submit(), added to capture common elements of audit
  record submission for many applications.

Obtained from:	TrustedBSD Project
2006-06-05 10:52:12 +00:00
Robert Watson
0127a4bb1b This commit was generated by cvs2svn to compensate for changes in r159248,
which included commits to RCS files with non-trunk default branches.
2006-06-05 10:52:12 +00:00
Hartmut Brandt
6f557cf7be Vendor patch: add support for the BITS construct and enumerations in both
gensnmpdef and gensnmptree. Add include and typedef directives to gensnmptree.

Submitted by:	soc-sheryana (partly)
2006-05-30 07:46:52 +00:00
Hartmut Brandt
1164383c76 This commit was generated by cvs2svn to compensate for changes in r159063,
which included commits to RCS files with non-trunk default branches.
2006-05-30 07:46:52 +00:00
Xin LI
2440a45859 Resolve conflicts. 2006-05-21 15:52:24 +00:00
Xin LI
7a997a696b Import netcat from OpenBSD 3.9-RELEASE. 2006-05-21 15:49:27 +00:00
Xin LI
50973020f9 This commit was generated by cvs2svn to compensate for changes in r158795,
which included commits to RCS files with non-trunk default branches.
2006-05-21 15:49:27 +00:00
Giorgos Keramidas
d9c49a535a Update the description of the `STATE' column for SMP systems,
and add the missing `C' SMP-only column.

PR:		docs/29245
Submitted by:	ada@bsd.org
Patch by:	Pawel Worach <pawel.worach@telia.com>
MFC after:	3 days
2006-05-16 15:27:43 +00:00
Crist J. Clark
a719d3b931 Option for setting a fixed destination port. This is useful for tracing
to a host behind a firewall where only specific services are allowed.
For example, to trace the hops to an HTTP server behind a firewall,

  $ traceroute -e -P tcp -p 80 www-firewalled.example.com

MFC after:	1 week
2006-05-11 06:30:18 +00:00
Ruslan Ermilov
c8e1eaa0a4 Re-add option -C to usage(). 2006-04-19 12:19:06 +00:00
Giorgos Keramidas
4ced3fbbf1 Document the -C option of top(1), which has been added to the source
and the usage message of top, but not to the manpage.

Pointy hat to:  keramida
Reminded by:    ru
MFC after:      1 week
2006-04-19 11:47:51 +00:00
Ruslan Ermilov
7734a577e3 Bring SYNOPSIS in line with usage(). 2006-04-18 15:26:58 +00:00
Darren Reed
649a43212c fix "ipf -Z" reporting rubbish and possibly panic'ing box
MFC after:	4 days
2006-04-18 13:24:14 +00:00
Xin LI
572a2b3303 Correct a typo: In order to make fixmount(8) quite, one should
use -q, not -v.
2006-04-18 03:33:17 +00:00
Gregory Neil Shapiro
4377aa4cf4 Add a note regarding bumping the freebsd*mc files for mergemaster's sake. 2006-04-13 04:12:38 +00:00
Max Laier
11d15d51b3 Document authpf's requirement for a mounted fdescfs(5).
PR:		docs/89635
MFC after:	1 day
2006-03-28 15:26:16 +00:00
Andrey A. Chernov
5735c87c05 Remove unneded files from the vendor branch too
Pointed by:     ru
2006-03-28 08:29:34 +00:00
Andrey A. Chernov
a7018ed63f Merge conflicts after official patches 2006-03-27 23:53:05 +00:00
Andrey A. Chernov
1719ccc2c3 Official patches 001-004 2006-03-27 23:45:09 +00:00
Andrey A. Chernov
3343da209a This commit was generated by cvs2svn to compensate for changes in r157191,
which included commits to RCS files with non-trunk default branches.
2006-03-27 23:45:09 +00:00
Andrey A. Chernov
ea3d03fb07 Resolve conflicts 2006-03-27 23:11:32 +00:00
Andrey A. Chernov
e8f10fd55c Remove obsoleted files, update upgrade instructions 2006-03-27 22:56:23 +00:00
Andrey A. Chernov
7a7865ca93 Virgin import of GNU Readline 5.1 2006-03-27 22:47:12 +00:00
Andrey A. Chernov
dc9e7fec00 This commit was generated by cvs2svn to compensate for changes in r157184,
which included commits to RCS files with non-trunk default branches.
2006-03-27 22:47:12 +00:00
Sam Leffler
b449aee71d Add eapol_version config parameter so folks with clients that (bogusly)
require the authenticator announce EAPOL version 1 don't have to hack
the code to get a working setup.

Discussed with Jouni; he's committed a similar set of changes to
his devel branch and I sent him these changes so I'm committing
this on the vendor branch in the expectation it will appear in
the next import.

MFC after:	1 week
2006-03-27 18:15:24 +00:00
Sam Leffler
ad90494725 This commit was generated by cvs2svn to compensate for changes in r157181,
which included commits to RCS files with non-trunk default branches.
2006-03-27 18:15:24 +00:00
Robert Watson
e61dc6cac4 Take contrib/openbsm/etc configuration files off the vendor branch in
order to add $FreeBSD$ tags, which helps mergemaster better manage
updating them.

Requested by:	several
Obtained from:	TrustedBSD Project
2006-03-26 01:44:35 +00:00
Gregory Neil Shapiro
81f8e61805 Record sendmail 8.13.6 upgrade 2006-03-22 16:48:21 +00:00
Gregory Neil Shapiro
567a2fc935 Resolve conflicts from sendmail 8.13.6 import 2006-03-22 16:45:56 +00:00
Gregory Neil Shapiro
4e4196cb74 Import sendmail 8.13.6
Security:       FreeBSD-SA-06:13.sendmail
2006-03-22 16:40:03 +00:00
Gregory Neil Shapiro
cda63d961b This commit was generated by cvs2svn to compensate for changes in r157001,
which included commits to RCS files with non-trunk default branches.
2006-03-22 16:40:03 +00:00
Colin Percival
d16f6f5027 Add missing code needed for the detection of IPSec packet replays. [1]
Correctly identify the user running opiepasswd(1) when the login name
differs from the account name. [2]

Security:	FreeBSD-SA-06:11.ipsec [1]
Security:	FreeBSD-SA-06:12.opie [2]
2006-03-22 16:00:42 +00:00
Ruslan Ermilov
e1fe3dba5c Reimplementation of world/kernel build options. For details, see:
http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
2006-03-17 18:54:44 +00:00
Hartmut Brandt
5ae1be8157 This is actually a section 3 man page, not section 1. Also fix a couple
of grammatical errors.

Submitted by:	jkoshy@
2006-03-17 10:04:10 +00:00
Hartmut Brandt
21f8c855ab This commit was generated by cvs2svn to compensate for changes in r156803,
which included commits to RCS files with non-trunk default branches.
2006-03-17 10:04:10 +00:00
Hajimu UMEMOTO
abaa31b2e9 Remove the nls/*/charset files to the exclude list. These files
are required for NLS catalog support.
2006-03-16 04:01:27 +00:00
Max Laier
1a58af5ef7 Constfy errstr as it is in OpenBSD to unbreak the build.
Pointed out by:	Suken Woo, Martin Wilke, Wesley Morgan
2006-03-15 16:28:12 +00:00
Max Laier
8744275265 Use strtonum now that we have it in libc as well. 2006-03-15 00:30:19 +00:00
Maxime Henrion
7d6ea92e92 Import the latest snapshot of csup (20060313). 2006-03-14 03:51:13 +00:00
Maxime Henrion
6f6b63eb8d This commit was generated by cvs2svn to compensate for changes in r156701,
which included commits to RCS files with non-trunk default branches.
2006-03-14 03:51:13 +00:00
Hartmut Brandt
62dd3397a8 This commit was generated by cvs2svn to compensate for changes in r156678,
which included commits to RCS files with non-trunk default branches.
2006-03-13 09:37:22 +00:00
Hartmut Brandt
7ccfba936f Vendor fix: small man fixes, fix type names u_int8_t -> uint8_t. 2006-03-13 09:37:22 +00:00
Hartmut Brandt
ef52b4dc88 Don't import tree.h from the distribution - we have our own one in sys. 2006-03-13 09:30:26 +00:00
Hiroki Sato
c0f0812202 Fix incorrect command line examples.
Submitted by:	Yoshihiko Sarumaru (mistral at imasy dot or dot jp)
PR:		docs/94158
MFC after:	2 days
2006-03-07 18:34:18 +00:00
Sam Leffler
f40bc3005e resolve merge conflicts
MFC after:	2 weeks
2006-03-07 05:51:52 +00:00
Sam Leffler
89f5e593c0 Import of hostapd 0.4.8 2006-03-07 05:47:04 +00:00
Sam Leffler
56d501bc34 This commit was generated by cvs2svn to compensate for changes in r156373,
which included commits to RCS files with non-trunk default branches.
2006-03-07 05:47:04 +00:00