diff options
| author |   brynet <brynet@openbsd.org> | 2018-11-08 14:06:09 +0000 |
|---|---|---|
| committer | brynet <brynet@openbsd.org> | 2018-11-08 14:06:09 +0000 |
| commit | 27d06223217415d8a0b6fa89b3d592e9cbe98c1c (patch) | |
| tree | a970efaca8892268a225cf33bc229476ff084ef6 /usr.sbin/tcpdump/tcpdump.c | |
| parent | introduce smtp-in keyword in grammar so we can report smtp-in and smtp-out (diff) | |
| download | wireguard-openbsd-27d06223217415d8a0b6fa89b3d592e9cbe98c1c.tar.xz wireguard-openbsd-27d06223217415d8a0b6fa89b3d592e9cbe98c1c.zip | |
Hoist opening pf.os(5) fingerprints '-o' earlier so that it doesn't
need to be unveiled at runtime in the monitor process.
Cleanup the unused internal privsep "getlines" code, we now explictly
fdpass the OS fingerprints file instead.
ok mestre@ kn@
Diffstat (limited to 'usr.sbin/tcpdump/tcpdump.c')
| -rw-r--r-- | usr.sbin/tcpdump/tcpdump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c index aa389a8243f..b4818a38491 100644 --- a/usr.sbin/tcpdump/tcpdump.c +++ b/usr.sbin/tcpdump/tcpdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpdump.c,v 1.87 2018/07/06 07:13:21 dlg Exp $ */ +/* $OpenBSD: tcpdump.c,v 1.88 2018/11/08 14:06:09 brynet Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -471,6 +471,8 @@ main(int argc, char **argv) bpf_dump(fcode, dflag); exit(0); } + if (oflag) + oflag = init_pfosfp(); init_addrtoname(localnet, netmask); if (WFileName) { @@ -500,8 +502,6 @@ main(int argc, char **argv) (void)fflush(stderr); } - if (oflag) - oflag = init_pfosfp(); if (tflag > 0) thiszone = gmt2local(0); |