From nobody Wed Apr 26 15:10:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q62NW7101z46djJ; Wed, 26 Apr 2023 15:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q62NW6SfMz3HcD; Wed, 26 Apr 2023 15:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682521803; 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=o6OQcIBRlsFcKOKQyKDhouujSncgl2ONTgseJh97VO4=; b=tuag+MAovCfpOz+CeLfrefcFA9551NDznMw1Lam21pJTHIE1q5BEc/fVS0e4uf164l9v6i /hzT4Y7vm26rVZnnaXTK1TPTb8xzj+T5cYv97t1fHzyja/H8rDLmIAIp6kh8vZvTUYfbVp cbQB0YDMUSD5EkE4xM4XAlnzvlfND8IPH3EyEUAameT1pd8ey6ubrO5PZgBoCI27arVDLq Q4k1tIZmLVM5XCGGkkUWSHaf6NYltvfSUmirqMDHOULnfaw1jUBXitAtY40cNNHpun5mmy 7GfLLPGxcGfYxZRb9C9iFLkstCwq6qVel5dtqkaYETVyPycEBEvrapHZEZNbxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682521803; 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=o6OQcIBRlsFcKOKQyKDhouujSncgl2ONTgseJh97VO4=; b=diJNjZKBAQX7gndb+XHbzM6i3db5ivan1B1DFVZQyyGHhL6FK/35iroS5IpEJ9D7jmjTB2 h38eFY6u4sBcm9jE8pbdNA5XdetQPBsnF3El3RRk7IaLD8XrvfOqqQenLAbdg6GkEMRfPd KmgbJ9fDqWXv9SbYYyOOKzlVflVZO+W4/pazxFQkRr3BrGL12h3897StaMpwqS/iol4qdJ fV/fDEftEzgFtNYKco7OLtvOIrVI0KmH77QQ6gBr7BIo9C5QWUfZLa7YSs0wd2yrUyguM+ rk9EysyP3idqR4i+/FdX+I45FePNHefYA8vtNgqMAVtEpOXqfVC9cwe8Qt56ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682521803; a=rsa-sha256; cv=none; b=BxllDUGyKgiXl/hnY9eFz/EdvCCgeBSGoAeJUJT72cu8reN569OdlunyZrM96dJdB3Yswf eCO6XOOEIMtCc53XGu52GN9old8zJdxRNBgaGwH1r2+IIXv4NNmaTlTzwLI9mnSLAY7txu OPRQWgdgKEwfZ+hKvLXq0gQOZMiGGA7n4/0RrYiAuxy9wCg3uwHDl3O9M2kVj193zLWdK2 h9KnaOP6tw7uGD0txHUwkHlTT+nt2fhMa159pSkNVBkcitVXtb0NzSIl4UOOv1uJztfNiE dICeXfzsfNXxkByDWKUPTo3EH4GphzzD0GM6cS3ENKuu9T4R24AktJ+kKz5G4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q62NW5Qt2zfM5; Wed, 26 Apr 2023 15:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33QFA3dO073286; Wed, 26 Apr 2023 15:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QFA3sD073283; Wed, 26 Apr 2023 15:10:03 GMT (envelope-from git) Date: Wed, 26 Apr 2023 15:10:03 GMT Message-Id: <202304261510.33QFA3sD073283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9ec48bc31e45 - main - pfctl: match expand_label_addr() prototype to definition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ec48bc31e45c619fb0eb5cda42d23b09edde614 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9ec48bc31e45c619fb0eb5cda42d23b09edde614 commit 9ec48bc31e45c619fb0eb5cda42d23b09edde614 Author: Kristof Provost AuthorDate: 2023-04-25 14:01:45 +0000 Commit: Kristof Provost CommitDate: 2023-04-26 15:09:46 +0000 pfctl: match expand_label_addr() prototype to definition Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index b0f631a5998c..1a0935ce599b 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -351,7 +351,7 @@ int rdr_consistent(struct pfctl_rule *); int process_tabledef(char *, struct table_opts *); void expand_label_str(char *, size_t, const char *, const char *); void expand_label_if(const char *, char *, size_t, const char *); -void expand_label_addr(const char *, char *, size_t, u_int8_t, +void expand_label_addr(const char *, char *, size_t, sa_family_t, struct pf_rule_addr *); void expand_label_port(const char *, char *, size_t, struct pf_rule_addr *);