diff options
| author | Max Laier <mlaier@FreeBSD.org> | 2005-05-03 16:47:37 +0000 |
|---|---|---|
| committer | Max Laier <mlaier@FreeBSD.org> | 2005-05-03 16:47:37 +0000 |
| commit | b1feb7cada455f06b20c3a781d358f37b8161125 (patch) | |
| tree | 824c4eb19d53458f61e487fc41248e092826de6d /contrib/pf/pflogd | |
| parent | b01933e6bf90b35ba467ac88917f46cc3676b371 (diff) | |
| parent | 61a1372b419ef876d7a8948241bc561a1866448c (diff) | |
| download | src-b1feb7cada455f06b20c3a781d358f37b8161125.tar.gz src-b1feb7cada455f06b20c3a781d358f37b8161125.zip | |
This commit was generated by cvs2svn to compensate for changes in r145837,
which included commits to RCS files with non-trunk default branches.
Notes
Notes:
svn path=/head/; revision=145838
Diffstat (limited to 'contrib/pf/pflogd')
| -rw-r--r-- | contrib/pf/pflogd/pflogd.8 | 5 | ||||
| -rw-r--r-- | contrib/pf/pflogd/privsep_fdpass.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/contrib/pf/pflogd/pflogd.8 b/contrib/pf/pflogd/pflogd.8 index ac8fe78aa0a7..d13b772b630a 100644 --- a/contrib/pf/pflogd/pflogd.8 +++ b/contrib/pf/pflogd/pflogd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pflogd.8,v 1.24 2004/01/16 10:45:49 jmc Exp $ +.\" $OpenBSD: pflogd.8,v 1.25 2005/01/02 18:15:02 jmc Exp $ .\" .\" Copyright (c) 2001 Can Erkin Acar. All rights reserved. .\" @@ -161,7 +161,8 @@ Interface name equals "kue0". Rule number equals 10. .It reason match Reason equals match. -Also accepts "bad-offset", "fragment", "short", "normalize" and "memory". +Also accepts "bad-offset", "fragment", "bad-timestamp", "short", +"normalize" and "memory". .It action pass Action equals pass. Also accepts "block". diff --git a/contrib/pf/pflogd/privsep_fdpass.c b/contrib/pf/pflogd/privsep_fdpass.c index 166b6930b3bd..50afdfc28595 100644 --- a/contrib/pf/pflogd/privsep_fdpass.c +++ b/contrib/pf/pflogd/privsep_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep_fdpass.c,v 1.1 2003/10/22 18:51:55 canacar Exp $ */ +/* $OpenBSD: privsep_fdpass.c,v 1.2 2004/08/13 02:51:48 djm Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -108,6 +108,10 @@ receive_fd(int sock) __func__, (long)n); if (result == 0) { cmsg = CMSG_FIRSTHDR(&msg); + if (cmsg == NULL) { + warnx("%s: no message header", __func__); + return -1; + } if (cmsg->cmsg_type != SCM_RIGHTS) warnx("%s: expected type %d got %d", __func__, SCM_RIGHTS, cmsg->cmsg_type); |