From patchwork Sun Jun 5 09:25:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5644 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4LGB7P0Kzjz3yZD for ; Sun, 5 Jun 2022 09:25:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4LGB7M63CRzNC; Sun, 5 Jun 2022 09:25:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4LGB7M562jz2xxK; Sun, 5 Jun 2022 09:25:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4LGB7K70fWz2xfN for ; Sun, 5 Jun 2022 09:25:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4LGB7J0w83zNC for ; Sun, 5 Jun 2022 09:25:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1654421149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3zqCXG855XAhKVUZkg7hkmhxTo3keXxGdw1F2/lBIxk=; b=V3r51c48khBgMyJZT1Qf3TCzBsNIRcw+Bh9gsVrByV0Q1kHfIc0nCMS3G6f0b3T/3vwet+ 1TJSWcrSt+CeXUBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1654421149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3zqCXG855XAhKVUZkg7hkmhxTo3keXxGdw1F2/lBIxk=; b=eyU5PobJ5fRyL+4kGpoUpzVx5kYi7KBkaJn5edFxGmZ/F5YAfYjXHr67wxh2mZvwFqgaEc kVpO/UdPfuFNmvrxmzokHU6d63HcbqjyPPkJycK7HEk7+/s92u+liWRPehIlF53q9m+j3o T0hT1MklK/Gk2YiBoSICLymH7WGD5flVOwSP+1WuVNwKz2zzrMaLUJU4e0Cv5YAFQB3WAK +OEJNAvxkbcs49x5qX16keVtc5EEd3+yXo+X4RXuUUld/eB3w2w/5JDyHQOpivYrtA6/f1 cOU6H4BvE1bat6nldYH65q4x3YII8QZjAc2/mJrkcxJtYZhLJYxVGaUHNTUUOQ== Message-ID: <80845fcb-2e54-4fee-9636-edb197aa14db@ipfire.org> Date: Sun, 5 Jun 2022 09:25:45 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Location" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] location-importer: AS names starting with "DNIC" actually are valid X-BeenThere: location@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: location-bounces@lists.ipfire.org Sender: "Location" These are all assigned to the US Department of Defense. Signed-off-by: Peter Müller --- src/scripts/location-importer.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/location-importer.in b/src/scripts/location-importer.in index bee9186..4e9dc8c 100644 --- a/src/scripts/location-importer.in +++ b/src/scripts/location-importer.in @@ -894,7 +894,7 @@ class CLI(object): continue # Skip any AS name that appears to be a placeholder for a different RIR or entity... - if re.match(r"^(ASN-BLK|)(AFCONC|AFRINIC|APNIC|ASNBLK|DNIC|LACNIC|RIPE|IANA)(?:\d?$|\-)", name): + if re.match(r"^(ASN-BLK|)(AFCONC|AFRINIC|APNIC|ASNBLK|LACNIC|RIPE|IANA)(?:\d?$|\-)", name): continue # Bail out in case the AS name contains anything we do not expect here...