diff options
author | rwatson <rwatson@FreeBSD.org> | 2007-07-22 12:18:31 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2007-07-22 12:18:31 +0000 |
commit | 2f3a6f61b35551e267159ec9175942da9175bbde (patch) | |
tree | 504ceacc262ae2b668bb2ddae055672e0375a705 /contrib/openbsm/libbsm | |
parent | 9d9ec51b2c47983a8f8c8d48ed2fca487c2b272a (diff) | |
download | FreeBSD-src-2f3a6f61b35551e267159ec9175942da9175bbde.zip FreeBSD-src-2f3a6f61b35551e267159ec9175942da9175bbde.tar.gz |
Vendor import TrustedBSD OpenBSM 1.0 alpha 15, with the following change
history since the last import:
OpenBSM 1.0 alpha 15
- Fix bug when processing in_addr_ex tokens.
- Restore the behavior of printing the string/text specified while
auditing arg32 tokens.
- Synchronized audit event list to Solaris, picking up the *at(2) system call
definitions, now required for FreeBSD and Linux. Added additional events
for *at(2) system calls not present in Solaris.
- Bugs in auditreduce(8) fixed allowing partial date strings to be used in
filtering events.
Approved by: re (hrs)
MFC after: 3 weeks
Obtained from: TrustedBSD Project
Diffstat (limited to 'contrib/openbsm/libbsm')
-rw-r--r-- | contrib/openbsm/libbsm/au_control.3 | 4 | ||||
-rw-r--r-- | contrib/openbsm/libbsm/au_event.3 | 4 | ||||
-rw-r--r-- | contrib/openbsm/libbsm/audit_submit.3 | 4 | ||||
-rw-r--r-- | contrib/openbsm/libbsm/bsm_io.c | 3 | ||||
-rw-r--r-- | contrib/openbsm/libbsm/bsm_token.c | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/contrib/openbsm/libbsm/au_control.3 b/contrib/openbsm/libbsm/au_control.3 index daf045f..e17ae16 100644 --- a/contrib/openbsm/libbsm/au_control.3 +++ b/contrib/openbsm/libbsm/au_control.3 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#9 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -77,7 +77,7 @@ resets the database iterator to the beginning of the database; see the section for more information. .Pp The -.Fn sendac +.Fn endac function closes the .Xr audit_control 5 diff --git a/contrib/openbsm/libbsm/au_event.3 b/contrib/openbsm/libbsm/au_event.3 index 8abaaa8..8fe25b4 100644 --- a/contrib/openbsm/libbsm/au_event.3 +++ b/contrib/openbsm/libbsm/au_event.3 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#8 $ .\" .Dd April 19, 2005 .Dt AU_EVENT 3 @@ -131,7 +131,7 @@ Functions .Fn getauevnum , .Fn getauevnum_r , and -.Fn getauevnuam +.Fn getauevnonam will return a reference to a .Vt "struct au_event_ent" or diff --git a/contrib/openbsm/libbsm/audit_submit.3 b/contrib/openbsm/libbsm/audit_submit.3 index 46cb217..609468c 100644 --- a/contrib/openbsm/libbsm/audit_submit.3 +++ b/contrib/openbsm/libbsm/audit_submit.3 @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#12 $ .\" .Dd May 29, 2006 .Dt audit_submit 3 @@ -54,7 +54,7 @@ The header will contain the event class specified by .Fa au_event . The subject token will be generated based on .Fa au_ctx . -The return token is dependant on the +The return token is dependent on the .Fa status and .Fa reterr diff --git a/contrib/openbsm/libbsm/bsm_io.c b/contrib/openbsm/libbsm/bsm_io.c index afb0fd4..b1ffe45 100644 --- a/contrib/openbsm/libbsm/bsm_io.c +++ b/contrib/openbsm/libbsm/bsm_io.c @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#48 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 $ */ #include <sys/types.h> @@ -1306,6 +1306,7 @@ print_arg32_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, print_delim(fp, del); print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); print_delim(fp, del); + print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } } diff --git a/contrib/openbsm/libbsm/bsm_token.c b/contrib/openbsm/libbsm/bsm_token.c index 86c1f60..c660895 100644 --- a/contrib/openbsm/libbsm/bsm_token.c +++ b/contrib/openbsm/libbsm/bsm_token.c @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#62 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 $ */ #include <sys/types.h> @@ -411,7 +411,7 @@ au_to_in_addr_ex(struct in6_addr *internet_addr) ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); + ADD_MEM(dptr, internet_addr, 4 * sizeof(uint32_t)); return (t); } |