From nobody Fri Mar 29 12:02:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1565273826; cv=none; d=zoho.com; s=zohoarc; b=Um0YZuGbBENrhVEg4j4enV4cADudUpHvkZQmA7apcCGYjUBNm1aconl3VoclfsJ6qBt9ourBLn0AiUjSpC/PG8HVF8M8eA9kSVGFujWST7ukR1m52aQLiY8qeRwAR/Aoc0gX9lMGAoOMEWyU6E8KHsO84Myjkso5j9cEBQHtkbk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565273826; 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:ARC-Authentication-Results; bh=xDocCjI4eyAiNS263T0LKMVz4e2jVv7Cz57+WvjaJhI=; b=nNLiKEytlI8gXgiAWZhJbVO3O3+CCGR3yCUbMntnJuxcrKxwr/Wme6ZWWlJNb32f2h3qVbyGvFkNnWCQNSg3sSU3Ak8Np3ZBTXlHUY1B4y1mEBtz4qSdS7WZmcZEvkVbRAn90LFd4ckWkJ3kY3aFwDuC8EUwfAjRhGQnOcn07GU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565273826979529.3282481367345; Thu, 8 Aug 2019 07:17:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5731430C23BC; Thu, 8 Aug 2019 14:17:05 +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 1B2A060BEC; Thu, 8 Aug 2019 14:17:05 +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 C722F4EE96; Thu, 8 Aug 2019 14:17:04 +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 x78EH3xX016488 for ; Thu, 8 Aug 2019 10:17:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A7DC1001955; Thu, 8 Aug 2019 14:17:03 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (dhcp-94.gsslab.fab.redhat.com [10.33.9.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id B313110016F3; Thu, 8 Aug 2019 14:17:02 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 8 Aug 2019 15:17:00 +0100 Message-Id: <20190808141700.8840-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] nss: fix build on freebsd 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 08 Aug 2019 14:17:06 +0000 (UTC) The conversion to drop gnulib in the previous patch: commit 8242ce4f45700f326e13e5105accd08fb4b2f0b4 Author: Daniel P. Berrang=C3=A9 Date: Thu Aug 8 10:23:26 2019 +0100 tools: avoid accidentally using files from gnulib Missed a few conversions needed for FreeBSD. In particular netdb.h doesn't pull in sys/socket.h or netinet/in.h Signed-off-by: Daniel P. Berrang=C3=A9 --- Pushed as a CI fix tools/nss/libvirt_nss.c | 12 ++++++++---- tools/nss/libvirt_nss.h | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index b75f51c560..89f1f3fdac 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -26,7 +26,6 @@ =20 #include "libvirt_nss.h" =20 -#include #include #include #include @@ -541,7 +540,9 @@ aiforaf(const char *name, int af, struct addrinfo *pai,= struct addrinfo **aip) } =20 int -_nss_compat_getaddrinfo(void *retval, void *mdata ATTRIBUTE_UNUSED, va_lis= t ap) +_nss_compat_getaddrinfo(void *retval, + void *mdata __attribute__((unused)), + va_list ap) { struct addrinfo sentinel, *cur, *ai; const char *name; @@ -567,7 +568,9 @@ _nss_compat_getaddrinfo(void *retval, void *mdata ATTRI= BUTE_UNUSED, va_list ap) } =20 int -_nss_compat_gethostbyname2_r(void *retval, void *mdata ATTRIBUTE_UNUSED, v= a_list ap) +_nss_compat_gethostbyname2_r(void *retval, + void *mdata __attribute__((unused)), + va_list ap) { int ret; =20 @@ -594,7 +597,8 @@ _nss_compat_gethostbyname2_r(void *retval, void *mdata = ATTRIBUTE_UNUSED, va_list } =20 ns_mtab* -nss_module_register(const char *name ATTRIBUTE_UNUSED, unsigned int *size, +nss_module_register(const char *name __attribute__((unused)), + unsigned int *size, nss_module_unregister_fn *unregister) { *size =3D sizeof(methods) / sizeof(methods[0]); diff --git a/tools/nss/libvirt_nss.h b/tools/nss/libvirt_nss.h index fa4ff892c6..63e1bf0af5 100644 --- a/tools/nss/libvirt_nss.h +++ b/tools/nss/libvirt_nss.h @@ -26,6 +26,8 @@ #pragma once =20 #include +#include +#include #include =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list