From: florian <florian@openbsd.org>
Date: Wed, 21 Aug 2024 15:16:56 +0000 (+0000)
Subject: An area is either a decimal number or an IPv4 address.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=82905b67f7c62ac1a6b6ef1d36fc9891c7a0fab1;p=openbsd

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
---

diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y
index 82f51bfdd44..28523c23382 100644
--- a/usr.sbin/ospfd/parse.y
+++ b/usr.sbin/ospfd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.104 2021/10/15 15:01:28 naddy Exp $ */
+/*	$OpenBSD: parse.y,v 1.105 2024/08/21 15:16:56 florian Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -225,7 +225,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;
@@ -620,7 +620,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;
@@ -683,7 +683,7 @@ interface	: INTERFACE STRING	{
 			s = strchr($2, ':');
 			if (s) {
 				*s++ = '\0';
-				if (inet_aton(s, &addr) == 0) {
+				if (inet_pton(AF_INET, s, &addr) != 1) {
 					yyerror(
 					    "error parsing interface address");
 					free($2);