From nobody Sat Jan 01 00:26:47 2022 X-Original-To: dev-commits-src-all@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 1D0AB191D178; Sat, 1 Jan 2022 00:26:48 +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 4JQjVv6014z3G76; Sat, 1 Jan 2022 00:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A95AA14EF8; Sat, 1 Jan 2022 00:26:47 +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 2010Ql9E041018; Sat, 1 Jan 2022 00:26:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2010Ql4n041017; Sat, 1 Jan 2022 00:26:47 GMT (envelope-from git) Date: Sat, 1 Jan 2022 00:26:47 GMT Message-Id: <202201010026.2010Ql4n041017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 375fdb6e161e - stable/13 - libc: Fix build with -DNS_REREAD_CONF. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 375fdb6e161ea78a957314efeecd5ee0654a2793 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640996807; 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=t1FtgPIhRPSDYKFtaeXdFLJejG972sQ5CIcjQvzbLr0=; b=B6pabjZsIrmbCVH7VXnTYkCwel/VChf88CZLfShd0bqjqxRSlRHNVoRxARatFLaBrtEIg8 Eyapy37Lg/6gzDb1vv5Z2ZEgycmmsW3CjgpJcFrd3JYG8Zb/d2cGXElpDi7Zt0lygooqFI 0p3fvHctEOihXd0vsqpbKopaefKWEQgXHCsmyTfnxN4Z7ugGvVz0HrK+htHH+0MoerVHGM tk7QqiFrj+x90bjcwTIW0QR1TNu89wKJutFpHfSng7bMMtjT31XnyOz2+49k8Y0pKEjaNd VoprliVEdAVizd3XoJxMkg+EZ9poxQixMo7WOOGPrKbseEvRM7WjQLvR2L8ZQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640996807; a=rsa-sha256; cv=none; b=NLYJgI7OMrudNVpW3l6MjVy+iykdafClBr8obvnk245FgtQoYBZkdIZN1K8KbilqweX7f4 C1pKDvPRIywtIvxDMkYUSenhS8ZcrQHX97gD2sWJ9BDaXqvr7SWB462L52/2j1cTYpdMIF P0bD0pLGz8DyQ8ValQkVg4+Q9f61rALGY6LIK5spEU/xX4QA3TVjCv1T30BTxRYuEK01Rd sAVUFCDN1hcmVNExIy0YdIDb5MzSy+koVKzfaNBeFTPaWSpm06ZwaK9mSQna2lf0sbKp/w UOVgq6Zjbxx44IT3IH35s+xNu3SgN/QKk/2l7Z42DdPePLEdGzkSEW41Ye0ZNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=375fdb6e161ea78a957314efeecd5ee0654a2793 commit 375fdb6e161ea78a957314efeecd5ee0654a2793 Author: Alexander Motin AuthorDate: 2021-12-29 22:00:17 +0000 Commit: Alexander Motin CommitDate: 2022-01-01 00:26:43 +0000 libc: Fix build with -DNS_REREAD_CONF. MFC after: 3 days (cherry picked from commit 62ed2d0152dce6da883fef753e0995e6d85e0cf1) --- lib/libc/net/nsdispatch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c index b0f80d079b0b..ada7ac606e15 100644 --- a/lib/libc/net/nsdispatch.c +++ b/lib/libc/net/nsdispatch.c @@ -335,7 +335,9 @@ static int nss_configure(void) { static time_t confmod; +#ifndef NS_REREAD_CONF static int already_initialized = 0; +#endif struct stat statbuf; int result, isthreaded; const char *path;