diff options
| author | darrenr <darrenr@FreeBSD.org> | 2002-08-28 13:45:36 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2002-08-28 13:45:36 +0000 |
| commit | b6c99dc12d1df0bd6c5411ebc2532c7e80958f87 (patch) | |
| tree | 81b93fa5c42ca4d2d34cf81f86c9cdc19f3062a1 /contrib/ipfilter/ipmon.c | |
| parent | 694c267c8d167aa37044133d07c98fa76a0de2cf (diff) | |
| download | FreeBSD-src-b6c99dc12d1df0bd6c5411ebc2532c7e80958f87.zip FreeBSD-src-b6c99dc12d1df0bd6c5411ebc2532c7e80958f87.tar.gz | |
merge the changes from 3.4.29 that didn't go cleanly due to conflicts
Diffstat (limited to 'contrib/ipfilter/ipmon.c')
| -rw-r--r-- | contrib/ipfilter/ipmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ipfilter/ipmon.c b/contrib/ipfilter/ipmon.c index e3cd594..1b1cd71 100644 --- a/contrib/ipfilter/ipmon.c +++ b/contrib/ipfilter/ipmon.c @@ -961,13 +961,13 @@ int blen; *t++ = 'S'; lvl = LOG_ERR; } else if (ipf->fl_flags & FR_PASS) { - if (ipf->fl_flags & FR_LOGP) + if (ipf->fl_flags & FR_LOG) *t++ = 'p'; else *t++ = 'P'; lvl = LOG_NOTICE; } else if (ipf->fl_flags & FR_BLOCK) { - if (ipf->fl_flags & FR_LOGB) + if (ipf->fl_flags & FR_LOG) *t++ = 'b'; else *t++ = 'B'; |
