Skip to content

Commit

Permalink
Clean up man page sections.
Browse files Browse the repository at this point in the history
Instead of pointing to an "ethers" file-format man page for the format
of MAC addresses, just give the formats we support in the man page -
it's our code, so we, not the OS vendor, control the formats.

Default the section with usermod to section 8, as Solaris 2.12 isn't out
yet.
  • Loading branch information
guyharris committed Jan 17, 2017
1 parent e29b6b8 commit 9d140ff
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 30 deletions.
21 changes: 7 additions & 14 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,6 @@ NETFILTER_SRC
PCAP_SUPPORT_NETFILTER
USB_SRC
PCAP_SUPPORT_USB
MAN_ETHERS_SECTION
MAN_USERMOD_SECTION
MAN_MISC_INFO
MAN_FILE_FORMATS
Expand Down Expand Up @@ -7251,8 +7250,7 @@ fi
DYEXT="none"
MAN_FILE_FORMATS=5
MAN_MISC_INFO=7
MAN_USERMOD_SECTION=1M
MAN_ETHERS_SECTION=3N
MAN_USERMOD_SECTION=8
case "$host_os" in

aix*)
Expand Down Expand Up @@ -7511,25 +7509,21 @@ solaris*)
$as_echo "#define HAVE_SOLARIS 1" >>confdefs.h


DYEXT="so"

case "`uname -r`" in
5.12)
MAN_USERMOD_SECTION=8
MAN_ETHERS_SECTION=5
MAN_FILE_FORMATS=5
MAN_MISC_INFO=7

5.12)
;;
*)

*)
#
# Use System V conventions for man pages.
#

MAN_USERMOD_SECTION=1m
MAN_ETHERS_SECTION=4
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
esac

DYEXT="so"
;;
esac

Expand Down Expand Up @@ -8424,7 +8418,6 @@ ln -s ${srcdir}/bpf/net net





# Check whether --enable-usb was given.
if test "${enable_usb+set}" = set; then :
Expand Down
20 changes: 7 additions & 13 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1195,8 +1195,7 @@ fi
DYEXT="none"
MAN_FILE_FORMATS=5
MAN_MISC_INFO=7
MAN_USERMOD_SECTION=1M
MAN_ETHERS_SECTION=3N
MAN_USERMOD_SECTION=8
case "$host_os" in

aix*)
Expand Down Expand Up @@ -1429,25 +1428,21 @@ sinix*)
solaris*)
AC_DEFINE(HAVE_SOLARIS,1,[On solaris])

DYEXT="so"

case "`uname -r`" in
5.12)
MAN_USERMOD_SECTION=8
MAN_ETHERS_SECTION=5
MAN_FILE_FORMATS=5
MAN_MISC_INFO=7

5.12)
;;
*)

*)
#
# Use System V conventions for man pages.
#

MAN_USERMOD_SECTION=1m
MAN_ETHERS_SECTION=4
MAN_FILE_FORMATS=4
MAN_MISC_INFO=5
esac

DYEXT="so"
;;
esac

Expand Down Expand Up @@ -1492,7 +1487,6 @@ AC_SUBST(DYEXT)
AC_SUBST(MAN_FILE_FORMATS)
AC_SUBST(MAN_MISC_INFO)
AC_SUBST(MAN_USERMOD_SECTION)
AC_SUBST(MAN_ETHERS_SECTION)

AC_ARG_ENABLE([usb],
[AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])],
Expand Down
7 changes: 4 additions & 3 deletions pcap-filter.manmisc.in
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,10 @@ be checked for a match.
.IP "\fBether dst \fIehost\fP"
True if the Ethernet destination address is \fIehost\fP.
\fIEhost\fP
may be either a name from /etc/ethers or a number (see
.IR ethers (@MAN_ETHERS_SECTION@)
for numeric format).
may be either a name from /etc/ethers or a numerical MAC address of the
form "xx:xx:xx:xx:xx:xx", "xx.xx.xx.xx.xx.xx", "xx-xx-xx-xx-xx-xx",
"xxxx.xxxx.xxxx", "xxxxxxxxxxxx", or various mixes of ':', '.', and '-',
where each "x" is a hex digit (0-9, a-f, or A-F).
.IP "\fBether src \fIehost\fP"
True if the Ethernet source address is \fIehost\fP.
.IP "\fBether host \fIehost\fP"
Expand Down

0 comments on commit 9d140ff

Please sign in to comment.