From owner-svn-src-all@freebsd.org Sun Apr 19 19:54:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A33922A8276; Sun, 19 Apr 2020 19:54:16 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4950s43kNSz3Ngj; Sun, 19 Apr 2020 19:54:16 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 6EAC2ED5; Sun, 19 Apr 2020 19:54:16 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f173.google.com with SMTP id q17so6820113qtp.4; Sun, 19 Apr 2020 12:54:16 -0700 (PDT) X-Gm-Message-State: AGi0PuZKPOj7Bum2Q52YQnDv8iNAWCbrT2YFfUgONeeHJq5lUsDPLLSK nIGCHlYB/PW1hA51jPiipTZ3UXFZLXOSyIHiXXQ= X-Google-Smtp-Source: APiQypIiwwrTMGNMbDJeF2Eci8LKBzhG+QrBqB6TkcyP/IqO9mKrurEJh6ltV3HzEG8FE67qmXvk8X5cCEEcWXUEanw= X-Received: by 2002:aed:3ea5:: with SMTP id n34mr12632940qtf.60.1587326055854; Sun, 19 Apr 2020 12:54:15 -0700 (PDT) MIME-Version: 1.0 References: <202004191701.03JH1LFA002938@repo.freebsd.org> In-Reply-To: <202004191701.03JH1LFA002938@repo.freebsd.org> From: Kyle Evans Date: Sun, 19 Apr 2020 14:54:04 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r360102 - in head: libexec/rc/rc.d share/mk tools/build/mk To: Cy Schubert Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Apr 2020 19:54:16 -0000 On Sun, Apr 19, 2020 at 12:01 PM Cy Schubert wrote: > > Author: cy > Date: Sun Apr 19 17:01:21 2020 > New Revision: 360102 > URL: https://svnweb.freebsd.org/changeset/base/360102 > > Log: > Conditionally install Kerberos rc files based on MK_KERBEROS_SCRIPTS > instead of MK_KERBEROS. The reason for this change is some users > prefer to build FreeBSD WITHOUT_KERBEROS, wanting to retain the > Kerberos rc scripts to start/stop MIT Kerberos or Heimdal from ports. > > PR: 197337 > Reported by: Adam McDougall > Reviewed by: imp > Differential Revision: https://reviews.freebsd.org/D24252 > > [... snip ...] > Modified: head/share/mk/src.opts.mk > ============================================================================== > --- head/share/mk/src.opts.mk Sun Apr 19 17:01:17 2020 (r360101) > +++ head/share/mk/src.opts.mk Sun Apr 19 17:01:21 2020 (r360102) > @@ -237,6 +237,7 @@ __DEFAULT_DEPENDENT_OPTIONS= \ > INET \ > INET6 \ > KERBEROS \ > + KERBEROS_SCRIPTS \ > KVM \ > NETGRAPH \ > PAM \ > This hunk seems to be wrong, looking at more context. It's setting up a MK_KERBEROS_SCRIPTS_SUPPORT option... I'm kinda guessing what you intended is what the other commentary on this has been about -- defaulting KERBEROS_SCRIPTS to ON unless KERBEROS is OFF. Just moving it up to the __DEFAULT_DEPENDENT_OPTIONS block doesn't seem to do the trick, though, I guess kerberos is weird. Thanks, Kyle Evans