From f6661b320dda3f719f2b4253b032a486b584c905 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 21 Aug 2024 15:18:47 +0000 Subject: [PATCH] An area is either a decimal number or an IPv4 address. This lets us replace inet_aton with inet_pton since we do not need inet_aton's flexibility. phessler, sthen and Tom Smyth all confirm that they never came across a different way of specifying an area. OK claudio, deraadt --- usr.sbin/ospf6d/parse.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y index bbf2ca17b21..b25e030124c 100644 --- a/usr.sbin/ospf6d/parse.y +++ b/usr.sbin/ospf6d/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.52 2023/07/04 02:56:11 dlg Exp $ */ +/* $OpenBSD: parse.y,v 1.53 2024/08/21 15:18:47 florian Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby @@ -211,7 +211,7 @@ varset : STRING '=' string { ; conf_main : ROUTERID STRING { - if (!inet_aton($2, &conf->rtr_id)) { + if (inet_pton(AF_INET, $2, &conf->rtr_id) != 1) { yyerror("error parsing router-id"); free($2); YYERROR; @@ -489,7 +489,7 @@ areaid : NUMBER { $$.s_addr = htonl($1); } | STRING { - if (inet_aton($1, &$$) == 0) { + if (inet_pton(AF_INET, $1, &$$) != 1) { yyerror("error parsing area"); free($1); YYERROR; -- 2.20.1