summaryrefslogtreecommitdiffstats
path: root/usr.sbin/hostapd
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2012-04-24 14:56:08 +0000
committerjmc <jmc@openbsd.org>2012-04-24 14:56:08 +0000
commit242e3f46f7cb545b46878fd5b0ccc41c40053aff (patch)
treef3e94e0557d27945918a1378cfa6b5d483f72310 /usr.sbin/hostapd
parentdocument address truncation; from Steffen Daode Nurpmeso (diff)
downloadwireguard-openbsd-242e3f46f7cb545b46878fd5b0ccc41c40053aff.tar.xz
wireguard-openbsd-242e3f46f7cb545b46878fd5b0ccc41c40053aff.zip
take a stab at documenting when arguments need quoted, and valid macro
characters; prompted by a diff from robert peichaer org thanks gilles and henning for feedback ok deraadt zinke
Diffstat (limited to 'usr.sbin/hostapd')
-rw-r--r--usr.sbin/hostapd/hostapd.conf.511
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/hostapd/hostapd.conf.5 b/usr.sbin/hostapd/hostapd.conf.5
index a104b577730..185cf7af61c 100644
--- a/usr.sbin/hostapd/hostapd.conf.5
+++ b/usr.sbin/hostapd/hostapd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostapd.conf.5,v 1.38 2011/06/23 20:35:22 sthen Exp $
+.\" $OpenBSD: hostapd.conf.5,v 1.39 2012/04/24 14:56:09 jmc Exp $
.\"
.\" Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: June 23 2011 $
+.Dd $Mdocdate: April 24 2012 $
.Dt HOSTAPD.CONF 5
.Os
.Sh NAME
@@ -55,6 +55,9 @@ and extend to the end of the current line.
Care should be taken when commenting out multi-line text:
the comment is effective until the end of the entire block.
.Pp
+Argument names not beginning with a letter, digit, or underscore
+must be quoted.
+.Pp
Additional configuration files can be included with the
.Ic include
keyword, for example:
@@ -63,8 +66,8 @@ include "/etc/hostapd.conf.local"
.Ed
.Sh MACROS
Macros can be defined that will later be expanded in context.
-Macro names must start with a letter, and may contain letters, digits
-and underscores.
+Macro names must start with a letter, digit, or underscore,
+and may contain any of those characters.
Macro names may not be reserved words (for example,
.Ic set ,
.Ic interface ,