From owner-svn-ports-all@freebsd.org Sat Apr 4 16:16:55 2020 Return-Path: Delivered-To: svn-ports-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 D8FE2278CAD; Sat, 4 Apr 2020 16:16:55 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48vhks0Dvwz4BR1; Sat, 4 Apr 2020 16:16:36 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id c7so12241942wrx.5; Sat, 04 Apr 2020 09:16:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=VD25/WCWAfCzNS25BTkfTlXIfFNMwAcUmj4ki85KYuk=; b=OV8flXqR7Qt9h4lDfgvWGrV8ehPHc9qg4u8Q5548r8rZN5rJRZx88sTtLN9VXOx1OV tDjL95x8ci+osyzYam5xbcDcbcbAy1qQHQOotiIFdipzig6sBCHc7uMxbjtGq5wuLzfH /9TH4JvoPUG0UdlsimSRVm2qc70l61d1bZp0WISWmgurloBeLkFu80+qRY0tUK/5MGk8 ApGoIKgckhq0Su3RVsKunteVYSld1TQu8bBRbU7sgIIPSs6Vhc3iBiYbTpLJ5klJRp8I sISLpd1Df7tfkIJS5sVN9R6Fk+Hn/iUielaYFN1z62I0jA0kzi/c6so+F71K/ZWmHiBq XVew== X-Gm-Message-State: AGi0PuYiRM9MufkdfVYyIy2QjBedGLpj0nW7ng7qdAqQAnxQTvoQzu7K JNW2ZbSOP6GbMetyQlNIPHOMwSQ/ X-Google-Smtp-Source: APiQypIzRVTY+nEpKWkxoRnrGVOXSPRddwvAkdG6jZdaQkDV4+Lb+nayDc+aJ55B66xmhabicw1sxg== X-Received: by 2002:adf:94c6:: with SMTP id 64mr15103310wrr.386.1586016986944; Sat, 04 Apr 2020 09:16:26 -0700 (PDT) Received: from ?IPv6:2a02:8109:98c0:1bc0:5e5f:67ff:fef4:ffd8? ([2a02:8109:98c0:1bc0:5e5f:67ff:fef4:ffd8]) by smtp.gmail.com with ESMTPSA id a13sm16924123wrh.80.2020.04.04.09.16.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Apr 2020 09:16:26 -0700 (PDT) Subject: Re: svn commit: r530685 - in head/net-mgmt/netdata: . files To: Matthias Andree , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <202004041541.034FfRqs057049@repo.freebsd.org> From: Mateusz Piotrowski <0mp@FreeBSD.org> Message-ID: <9ee4098b-ca2a-f56e-977f-d43ea0ee9309@FreeBSD.org> Date: Sat, 4 Apr 2020 18:16:42 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <202004041541.034FfRqs057049@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Rspamd-Queue-Id: 48vhks0Dvwz4BR1 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mpp302@gmail.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=mpp302@gmail.com X-Spamd-Result: default: False [-3.16 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[FreeBSD.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-1.16)[ip: (-4.86), ipnet: 209.85.128.0/17(-0.44), asn: 15169(-0.43), country: US(-0.05)]; RCVD_IN_DNSWL_NONE(0.00)[49.221.85.209.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FORGED_SENDER(0.30)[0mp@FreeBSD.org,mpp302@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[49.221.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[0mp@FreeBSD.org,mpp302@gmail.com]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Apr 2020 16:16:56 -0000 On 4/4/20 5:41 PM, Matthias Andree wrote: > Author: mandree > Date: Sat Apr 4 15:41:26 2020 > New Revision: 530685 > URL: https://svnweb.freebsd.org/changeset/ports/530685 > > Log: > net-mgmt/netdata rc script overhaul, fix termination, user config ... > Modified: head/net-mgmt/netdata/files/netdata.in > ============================================================================== > --- head/net-mgmt/netdata/files/netdata.in Sat Apr 4 15:37:31 2020 (r530684) > +++ head/net-mgmt/netdata/files/netdata.in Sat Apr 4 15:41:26 2020 (r530685) > @@ -13,24 +13,111 @@ ... > +# check if the rc.conf* file set and netdata_conf agree on the name to run the bundle as > +check_user_consistency() { > + cfusr=$(get_user_from_conf) > + if [ -z "$cfusr" -o "$cfusr" = "${netdata_user}" ] ; then return 0 ; fi > + echo >&2 "$0: ERROR: ${netdata_conf} sets 'run as user = $cfusr', but rc.conf* sets '${netdata_user}'. Both must be consistent." Could this use err() from rc.subr(8) instead?