From nobody Sun Apr 28 21:45:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598952515; cv=none; d=zohomail.com; s=zohoarc; b=SL08JFMDB849kEJ927R5s8Kelbf6Y8LJ76Dg6vkvEmUDDGrTETn31gMKOz/3WDHQ9DEVq3aRbzq2FwaBzy5cezou6IBSqIc9xp01ZojeZipapdOYtWfaFPfN6BEzjuFJZ2tfBkbczRynXfdbFgaqeUU5aRphmC1i07ukAgCl8KI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952515; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=eQgHwI3/hhGb9RhIYc3jQY/P5h93KOVD4XDHkdA88hY=; b=QP4AO7c8ICOMpg/hLQ6mDvLiqGvGhZU8KRdCn6PByWdtJmgUg5njbbhN5zS9fbP0Xs26FIHlqTVNbA1fpamRs2voILC7514OEEJS0W9Xz8H/iqevRy2LZuYUq3fvtJSYH++8Vi6si8se9pBz8yvYrDuGTUA7JVH0H8Hrc3OC0Jg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1598952515701119.14003839681516; Tue, 1 Sep 2020 02:28:35 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-f1ns_kXiOfS1oFaXgTagrg-1; Tue, 01 Sep 2020 05:28:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7610F1DDF0; Tue, 1 Sep 2020 09:28:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FB1E1002D52; Tue, 1 Sep 2020 09:28:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 01A6579A1E; Tue, 1 Sep 2020 09:28:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0819RAUG016880 for ; Tue, 1 Sep 2020 05:27:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id C8FD4100EBBE; Tue, 1 Sep 2020 09:27:10 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4984D105DFA2 for ; Tue, 1 Sep 2020 09:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598952514; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=eQgHwI3/hhGb9RhIYc3jQY/P5h93KOVD4XDHkdA88hY=; b=Qkmn0Il+AMVkFNDpAIXhO/rRDzu4imooZfh3ePVBieCIP5bVPYRRxbYrNJWLEJUxs7DwPz ilcH1m7hJPtPVRL6nhF2s9E4etwqAfA19o3TtiM6PaTvPDNanYoF+71pyujcl1fFtFfQB3 wcsDXEvKz+P12TBrGbFOYBLy1oIcvmo= X-MC-Unique: f1ns_kXiOfS1oFaXgTagrg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] nss: Finish renaming of HAVE_BSD_NSS macro Date: Tue, 1 Sep 2020 11:26:58 +0200 Message-Id: <888d90f679bbde54e9f18ef9d342afbb2ff51a20.1598952418.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When switching to meson, some of HAVE_* macros were renamed to WITH_ because they did not reflect whether the build platform has or doesn't have something, but whether we are building with some functionality turned on or off. This is the case with HAVE_BSD_NSS macro too. As a result, the NSS plugin built on BSD did not expose nss_module_register() function which made the plugin unusable: https://www.redhat.com/archives/libvir-list/2020-September/msg00000.html Fixes: c74268705557a6781788ba011492c15df2e3df11 Reported-by: Roman Bogorodskiy Signed-off-by: Michal Privoznik Reviewed-by: Jiri Denemark Reviewed-by: Roman Bogorodskiy --- tools/nss/libvirt_nss.c | 6 +++--- tools/nss/libvirt_nss.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 3b89f72742..6331c65131 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -37,7 +37,7 @@ #include =20 =20 -#if defined(HAVE_BSD_NSS) +#if defined(WITH_BSD_NSS) # include #endif =20 @@ -451,7 +451,7 @@ NSS_NAME(gethostbyname4)(const char *name, struct gaih_= addrtuple **pat, } #endif /* HAVE_STRUCT_GAIH_ADDRTUPLE */ =20 -#if defined(HAVE_BSD_NSS) +#if defined(WITH_BSD_NSS) NSS_METHOD_PROTOTYPE(_nss_compat_getaddrinfo); NSS_METHOD_PROTOTYPE(_nss_compat_gethostbyname2_r); =20 @@ -598,4 +598,4 @@ nss_module_register(const char *name __attribute__((unu= sed)), *unregister =3D NULL; return methods; } -#endif /* HAVE_BSD_NSS */ +#endif /* WITH_BSD_NSS */ diff --git a/tools/nss/libvirt_nss.h b/tools/nss/libvirt_nss.h index 95ebafdc71..121b9e8722 100644 --- a/tools/nss/libvirt_nss.h +++ b/tools/nss/libvirt_nss.h @@ -84,8 +84,8 @@ NSS_NAME(gethostbyname4)(const char *name, struct gaih_ad= drtuple **pat, int *herrnop, int32_t *ttlp); #endif /* HAVE_STRUCT_GAIH_ADDRTUPLE */ =20 -#if defined(HAVE_BSD_NSS) +#if defined(WITH_BSD_NSS) ns_mtab* nss_module_register(const char *name, unsigned int *size, nss_module_unregister_fn *unregister); -#endif /* HAVE_BSD_NSS */ +#endif /* WITH_BSD_NSS */ --=20 2.26.2