Commit Graph

4015 Commits

Author SHA1 Message Date
sam
a8bc04a53e resolve merge conflicts
MFC after:	1 month
2006-09-04 20:25:04 +00:00
sam
6bf6a28af3 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
a6a758d9f4 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
498672d448 Import of tcpdump v3.9.4 2006-09-04 20:04:42 +00:00
sam
aff9fbdea1 update instructions 2006-09-04 19:54:49 +00:00
sam
8bcc947abc resolve merge conflicts
MFC after:	1 month
2006-09-04 19:54:21 +00:00
sam
d439ca5cfb 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
ffd4bfbe7b Import of libpcap v0.9.4 2006-09-04 19:43:23 +00:00
rwatson
3ea08baaf6 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
rwatson
24713adf43 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
rwatson
e86b2a5131 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
rwatson
7dd78d9e52 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
rwatson
d7c02001bc 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
rwatson
3d2ffbe140 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
obrien
b606c5a704 Pull vendor file to HEAD. 2006-08-31 17:11:46 +00:00
obrien
05de6b8434 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
obrien
7c9122279a 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
obrien
69d151f2f0 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
imp
1b7c0c7165 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
imp
603e2aafcd 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
kan
d2e7ac2a73 Resolve conflicts after GCC 3.4.6 20060825 import. 2006-08-26 21:37:21 +00:00
kan
1cb0a74375 Gcc 3.4.6 F77 runtime support bits (as of 2006/08/25 #116475).
.
2006-08-26 21:30:30 +00:00
kan
76c8a9b91c 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
kan
7af6408ffb Gcc 3.4.6 Objective C support bits (as of 2006/08/25 #116475). 2006-08-26 21:30:26 +00:00
kan
fe2098148c 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
kan
42689eaf54 Gcc 3.4.6 C++ support bits (as of 2006/08/25 #116475). 2006-08-26 21:29:46 +00:00
kan
98048dc01d 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
kan
ab6c6e434e Gcc 3.4.6 as of 2006/08/25 #116475. 2006-08-26 21:29:10 +00:00
kan
5c84bed2e8 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
rwatson
61b3c1383b Update FreeBSD upgrade notes for OpenBSM.
Obtained from:	TrustedBSD Project
2006-08-26 10:35:54 +00:00
rwatson
8846902a40 Update for OpenBSM 1.0 alpha 9.
Obtained from:	TrustedBSD Project
2006-08-26 08:12:17 +00:00
rwatson
8eb051b933 Resolove conflicts from OpenBSM 1.0 alpha 9 into audit_event.
Obtained from:	TrustedBSD Project
2006-08-26 08:08:47 +00:00
rwatson
3dabba580b 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
rwatson
d2770d13ee 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
f820e4f79e 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
e1ca5f48d2 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
c21bc3bcaf Update for PowerPC support. We need to keep rs6000 related files. 2006-08-23 03:30:33 +00:00
marcel
b5a4404d7d 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
4e65ec3994 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
ru
4d582ffe09 Remove alpha left-overs. 2006-08-22 08:03:01 +00:00
delphij
5d60487351 Resolve conflicts. 2006-08-20 15:50:51 +00:00
delphij
a77e94924d 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
delphij
5297f4bc59 Import less v394 2006-08-20 15:49:51 +00:00
gshapiro
153084b4ce Update to sendmail 8.13.8 2006-08-17 05:16:15 +00:00
gshapiro
b5bc5fdd89 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
gshapiro
0a9c74f735 Import sendmail 8.13.8 2006-08-17 05:10:43 +00:00
guido
e49049679f Resolve conflicts
MFC after:	1 weeks
2006-08-16 12:23:02 +00:00
guido
3a39cf5435 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
guido
092f5d1218 Import IP Filter 4.1.13 2006-08-16 11:51:32 +00:00
keramida
e57c6a567c Spell 'connection options' correctly.
Submitted by:	  Leonidas Tsampros <ltsampros@upnet.gr>
2006-08-11 12:35:22 +00:00
cperciva
f0f632d37c Add note concerning FreeBSD-SA-06:01.texindex.
Suggested by:	csjp
2006-07-08 07:32:41 +00:00
rwatson
e3f66d999d Resolve conflicts from OpenBSM 1.0 alpha 7 import.
Obtained from:	TrustedBSD Project
2006-06-27 18:09:54 +00:00
rwatson
02d6c5b525 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
rwatson
8dc785807f 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
rwatson
5aa3857899 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
obrien
aad45ca6a0 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
obrien
0af3611cb6 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
obrien
705134c240 Document that 'bad cksum 0' is expected on NICs with checksum off-loading. 2006-06-20 05:04:05 +00:00
obrien
794e6404b6 Update for the 'file' 4.17 import. 2006-06-19 07:53:49 +00:00
obrien
5c5b299c7d Virgin import of Christos Zoulas's FILE 4.17. 2006-06-19 07:52:15 +00:00
obrien
b691046f2b 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
gshapiro
233a6af9c1 Update FreeBSD info regarding sendmail 8.13.7 import 2006-06-14 16:33:59 +00:00
gshapiro
18e97b419d Resolve conflicts from sendmail 8.13.7 import 2006-06-14 16:25:31 +00:00
gshapiro
1024e3943e Import sendmail 8.13.7
Security: FreeBSD-SA-06:17.sendmail
2006-06-14 16:23:02 +00:00
gshapiro
519bd6b141 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
dwmalone
929e55d609 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
57a3723590 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
marius
f5e830d091 * 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
maxim
45a0e271b2 o It's lilac-dmc.Berkeley.EDU, not lbl-csam.arpa.
Obtained from:	NetBSD
2006-06-07 21:37:42 +00:00
glebius
cd66f71303 - 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
rwatson
1c26f878c2 Regenerate config.h from OpenBSM 1.0 alpha 6 import.
Obtained from:	TrustedBSD Project
2006-06-05 11:06:32 +00:00
rwatson
f7669e6417 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
rwatson
4c355f6b7d 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
harti
f467eea07a 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
harti
934871b0b1 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
delphij
11228d528e Resolve conflicts. 2006-05-21 15:52:24 +00:00
delphij
71f517bebd 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
delphij
ae5f19e683 Import netcat from OpenBSD 3.9-RELEASE. 2006-05-21 15:49:27 +00:00
keramida
3937232b20 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
cjc
297aabd6d9 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
ru
b8c014aae7 Re-add option -C to usage(). 2006-04-19 12:19:06 +00:00
keramida
0fb9a8f112 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
ru
cb88fa831f Bring SYNOPSIS in line with usage(). 2006-04-18 15:26:58 +00:00
darrenr
a3ec5442cc fix "ipf -Z" reporting rubbish and possibly panic'ing box
MFC after:	4 days
2006-04-18 13:24:14 +00:00
delphij
a56278e488 Correct a typo: In order to make fixmount(8) quite, one should
use -q, not -v.
2006-04-18 03:33:17 +00:00
gshapiro
b016b4a609 Add a note regarding bumping the freebsd*mc files for mergemaster's sake. 2006-04-13 04:12:38 +00:00
mlaier
332f3f5a7b Document authpf's requirement for a mounted fdescfs(5).
PR:		docs/89635
MFC after:	1 day
2006-03-28 15:26:16 +00:00
ache
ead5fc05b9 Remove unneded files from the vendor branch too
Pointed by:     ru
2006-03-28 08:29:34 +00:00
ache
593cd30b45 Merge conflicts after official patches 2006-03-27 23:53:05 +00:00
ache
4769b932e5 Official patches 001-004 2006-03-27 23:45:09 +00:00
ache
6bf81397d7 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
ache
a258086b15 Resolve conflicts 2006-03-27 23:11:32 +00:00
ache
735555a46c Remove obsoleted files, update upgrade instructions 2006-03-27 22:56:23 +00:00
ache
8aeb9782f4 Virgin import of GNU Readline 5.1 2006-03-27 22:47:12 +00:00
ache
027bd1dc0a 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
8cb017d125 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
sam
620bfba120 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
rwatson
b8703f4120 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
gshapiro
1ea8124e9f Record sendmail 8.13.6 upgrade 2006-03-22 16:48:21 +00:00
gshapiro
a393d78792 Resolve conflicts from sendmail 8.13.6 import 2006-03-22 16:45:56 +00:00