From owner-svn-src-head@freebsd.org Sun Jun 24 04:24:39 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E107C101617E; Sun, 24 Jun 2018 04:24:38 +0000 (UTC) (envelope-from delphij@gmail.com) Received: from mail-it0-x22b.google.com (mail-it0-x22b.google.com [IPv6:2607:f8b0:4001:c0b::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 79D8377DCC; Sun, 24 Jun 2018 04:24:38 +0000 (UTC) (envelope-from delphij@gmail.com) Received: by mail-it0-x22b.google.com with SMTP id 76-v6so7938625itx.4; Sat, 23 Jun 2018 21:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=IAbAYAeb3ZvhkrIamVYdgxe6Uvxe68E+C8DQJUqMWAA=; b=Y8IeQu9VDXfB2WR7CPmUBx2dYm6K81E7pTi7CzrEx5G6WqVpLuLtqhE7kNLXo7moy/ ALUnROrrmq7VLCKPF9J6zb5A/ooNufdtIacRTjZeqC4YfTqS4I6T1cbTPvzPCVCBHu3C D8Ysg6UwKQHAX0RV7pSZwnwBBizeohEHopxx8cgSVCBZDUqZOjMfkMuc5S4vlIBt3W3/ DPUmi+9jE5n7ty+vrKY2fjQdkC/QRtqv+MgwC/CFurh62XxwWJCnbHxcCy7tSQzYZtY5 Bi10N0BTPZaTKCJKAOrNhCL8qvg/n6DRCGmEdAbnEeQjBG1kqPIp9EdPOGv+Jyl28B48 V0pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=IAbAYAeb3ZvhkrIamVYdgxe6Uvxe68E+C8DQJUqMWAA=; b=Mqh2kw3NyHsD1CasGlM/uOKpqbTsFjg4RqB3dRLsR380+FpaFcfZczOuS5vGOjR0mw x0d4QmXEp/S3i0SMbsTPzEYxutpuRrA2jcyo/VbDe6ECJk5UuSmw5MUaafX82GL/JCYU Ktw6OXRbVH/fR1pc55PiC/BCYucjLI4FVesHWgY4vuXRYjVyfUcQpJ/1rMg1tWs9BukN JvfLwP3oBBILxFRLAM4n968aoU4mRRuoGy4CC5ckk7E0kWNJgZXSFEQ3xhELqM7UJHXW kCL942WnkfWeEdfMMyZmk1RmTVe7qCBSmgQfOE+tnJ74BXo7M8L0Rh7hnVPOab6JaOHh 4b9Q== X-Gm-Message-State: APt69E1pkr9crqYwJXa0npnpIDfpZPUfLmw1/n09PRkmMWc0mKDb1lw9 o6iaaFJR8GXzDqEUbU1iN7de5fVqSg6QTKQ/TIH85w== X-Google-Smtp-Source: ADUXVKK4CU6Ib/mFCTSJnqmYpXNl7zHO6eqT4/H8ERjJE+CmT3QvyvbmHqEuGZupxD31oipwTQ7aWRP6HMOwRYcWgRA= X-Received: by 2002:a24:43cf:: with SMTP id s198-v6mr5787563itb.28.1529814277393; Sat, 23 Jun 2018 21:24:37 -0700 (PDT) MIME-Version: 1.0 References: <201806240329.w5O3T0kq033162@repo.freebsd.org> In-Reply-To: <201806240329.w5O3T0kq033162@repo.freebsd.org> From: Xin LI Date: Sat, 23 Jun 2018 21:24:25 -0700 Message-ID: Subject: Re: svn commit: r335595 - head/etc To: Ian Lepore Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2018 04:24:39 -0000 Oh thanks for that. Is there a plan to MFC? On Sat, Jun 23, 2018 at 8:29 PM Ian Lepore wrote: > > Author: ian > Date: Sun Jun 24 03:29:00 2018 > New Revision: 335595 > URL: https://svnweb.freebsd.org/changeset/base/335595 > > Log: > Modernize usage of "restrict" keyword in ntp.conf > > It is no longer necessary to specify a -4/-6 flag on any ntp.conf > keyword. The address type is inferred from the address itself as > necessary. "restrict default" statements always apply to both address > families regardless of any -4/-6 flag that may be present. > > So this change just tidies up our default config by removing the redundant > restrict -6 statement and comment, and by removing the -6 flag from the > restrict keyword that allows access from localhost. > > This change was inspired by the patches provided in PRs 201803 and 210245, > and included some contrib/ntp code inspection to verify that the -4/-6 > keywords are basically no-ops in all contexts now. > > PR: 201803 210245 > Differential Revision: https://reviews.freebsd.org/D15974 > > Modified: > head/etc/ntp.conf > > Modified: head/etc/ntp.conf > ============================================================================== > --- head/etc/ntp.conf Sat Jun 23 23:44:36 2018 (r335594) > +++ head/etc/ntp.conf Sun Jun 24 03:29:00 2018 (r335595) > @@ -62,15 +62,13 @@ pool 0.freebsd.pool.ntp.org iburst > # See http://support.ntp.org/bin/view/Support/AccessRestrictions > # for more information. > # > -restrict default limited kod nomodify notrap noquery nopeer > -restrict -6 default limited kod nomodify notrap noquery nopeer > -restrict source limited kod nomodify notrap noquery > +restrict default limited kod nomodify notrap noquery nopeer > +restrict source limited kod nomodify notrap noquery > > # > # Alternatively, the following rules would block all unauthorized access. > # > #restrict default ignore > -#restrict -6 default ignore > # > # In this case, all remote NTP time servers also need to be explicitly > # allowed or they would not be able to exchange time information with > @@ -85,7 +83,7 @@ restrict source limited kod nomodify notrap noquer > # > # The following settings allow unrestricted access from the localhost > restrict 127.0.0.1 > -restrict -6 ::1 > +restrict ::1 > > # > # If a server loses sync with all upstream servers, NTP clients >