aboutsummaryrefslogtreecommitdiff
path: root/options.c
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-09-19 20:12:43 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-09-19 20:12:43 +0000
commit6e2c457d5964e9a6efea0c21e3b1ff862df4060c (patch)
tree815f17d1c5920951df10e467f8608e9504780bff /options.c
parentPatched Makefile.am so that the new t_cltsrv-down.sh script becomes (diff)
downloadopenvpn-6e2c457d5964e9a6efea0c21e3b1ff862df4060c.tar.xz
Fixed --lladdr bug introduced in 2.1-rc9 where input validation code
was incorrectly expecting the lladdr parameter to be an IP address when it is actually a MAC address (HoverHell). git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3339 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'options.c')
-rw-r--r--options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/options.c b/options.c
index ca9b9e1..ebccd7f 100644
--- a/options.c
+++ b/options.c
@@ -3436,11 +3436,11 @@ add_option (struct options *options,
else if (streq (p[0], "lladdr") && p[1])
{
VERIFY_PERMISSION (OPT_P_UP);
- if (ip_addr_dotted_quad_safe (p[1])) /* FQDN -- IP address only */
+ if (mac_addr_safe (p[1])) /* MAC address only */
options->lladdr = p[1];
else
{
- msg (msglevel, "lladdr parm '%s' must be an IP address", p[1]);
+ msg (msglevel, "lladdr parm '%s' must be a MAC address", p[1]);
goto err;
}
}