Module Name: src
Committed By: roy
Date: Fri Jan 8 23:37:58 UTC 2016
Modified Files:
src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.8
Log Message:
Update wpa_supplicant(8) to what it actually does.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8
diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.3 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.4
--- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8:1.3 Tue Mar 18 18:20:36 2014
+++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8 Fri Jan 8 23:37:58 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: wpa_supplicant.8,v 1.3 2014/03/18 18:20:36 riastradh Exp $
+.\" $NetBSD: wpa_supplicant.8,v 1.4 2016/01/08 23:37:58 roy Exp $
.\"
.\" Copyright (c) 2005 Sam Leffler <[email protected]>
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" Based on:
.\" $FreeBSD: /repoman/r/ncvs/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8,v 1.2 2005/06/27 06:40:43 ru Exp $
.\"
-.Dd January 22, 2010
+.Dd January 8, 2016
.Dt WPA_SUPPLICANT 8
.Os
.Sh NAME
@@ -35,10 +35,19 @@
.Nd WPA/802.11i Supplicant for wireless network devices
.Sh SYNOPSIS
.Nm
-.Op Fl BdehLqvw
+.Op Fl BdhLqstuvW
+.Op Fl b Ar br_ifname
+.Op Fl C Ar ctrl
+.Fl c Ar config-file
+.Op Fl D Ar driver
+.Op Fl e Ar entropy-file
.Op Fl f Ar debug-file
+.Op Fl G Ar global-ctrl-group
+.Op Fl g Ar global-ctrl
.Fl i Ar ifname
-.Fl c Ar config-file
+.Op Fl O Ar override-ctrl
+.Op Fl o Ar override-driver
+.Op Fl P Ar pidfile
.Op Fl N i Ar ifname Fl c Ar config-file ...
.Sh DESCRIPTION
The
@@ -97,6 +106,12 @@ The following options are available:
.It Fl B
Detach from the controlling terminal and run as a daemon process
in the background.
+.It Fl b
+Optional bridge interface name.
+.It Fl C
+Control interface parameter.
+.It Fl D
+Driver name (can be either bsd or wired)
.It Fl d
Enable debugging messages.
If this option is supplied twice, more verbose messages are displayed.
@@ -104,16 +119,18 @@ Messages are sent to stdout by default,
This can be changed with the
.Fl f
flag.
-.It Fl e
-Use an external IEEE 802.1X Supplicant program and disable the
-internal Supplicant.
-This option is not normally used.
.It Fl f
Specifies a file to send debug messages to when enabled with the
.Fl d
flag.
+.It Fl G
+Global control interface group.
+.It Fl g
+Global control interface.
.It Fl h
Show help text.
+.It Fl I
+Additional configuration file.
.It Fl K
Include key information in debugging output.
.It Fl L
@@ -123,27 +140,37 @@ Specify an additional interface and conf
If multiple interfaces are specified then
.Nm
will manage them all with a single process.
+.It Fl O
+Override ctrl_interface parameter for new interface.
+.It Fl o
+Override driver paramter for new interface.
+.It Fl P
+File in which to save the process PID.
+.It Fl p
+Specify driver parameters.
.It Fl q
Decrease debugging verbosity (i.e., counteract the use of the
.Fl d
flag).
+.It Fl s
+Send log messages through syslog(3) instead of to the terminal.
+.It Fl t
+Include timestamp in debug messages.
.It Fl v
Display version information on the terminal and exit.
-.It Fl w
-If the specified interface is not present, wait for it to be
-added; e.g.\& a cardbus device to be inserted.
-.\" This option is not normally used; instead,
-.\" .Xr devd 8
-.\" should be configured to launch
-.\" .Nm
-.\" when a device is created.
+.It Fl W
+Wait for a control interface monitor before starting.
.El
.Sh SEE ALSO
.Xr ath 4 ,
.Xr ipw 4 ,
.Xr iwi 4 ,
+.Xr iwn 4 ,
.Xr ral 4 ,
+.Xr rum 4 ,
.Xr wi 4 ,
+.Xr wpi 4 ,
+.Xr zyd 4 ,
.Xr wpa_supplicant.conf 5 ,
.Xr ifconfig 8 ,
.Xr wpa_cli 8
