From nobody Sun Feb 8 23:35:23 2026 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=1564420413; cv=none; d=zoho.com; s=zohoarc; b=YJ/rHJbEiTrhI3z03HrHpOR82Hbmm9RVFphFNXx7JZ6IJfPVPcFQ53MMPL/FlhB9qLQswkRP+gBbX0dBqMk6OYz49oy/S8ksgxpi/mtTVAncxY/2GF6feyPS6YgxaQo71QxwMAEPHsT9jOTSYoo+kehtW/po1nVi3VNu8lVi/h8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564420413; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Wbvn2xN7w+1x2jMTS8fiLQpUzFU3+P11wk/aW3PkanQ=; b=CSDOxKy5E5uUtZVVZDAKF0+TPm8frmkMZ5Au4UbC1TCplaGr6RhXmmI1z18EZa+vhPNNsgcSRwe0sMuAVs3mextFQvufF3pwPkD0/wn+J81dH/z+vQ4bGfwRi7v5V46LhME4Pjteu7Vy8YkdYeJE+YCEb4sQxi6WMnmeosXQrBo= 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 1564420413049847.9716143577738; Mon, 29 Jul 2019 10:13:33 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A745308339B; Mon, 29 Jul 2019 17:13:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 632045D9C8; Mon, 29 Jul 2019 17:13:31 +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 20FAB1806B00; Mon, 29 Jul 2019 17:13:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6THDTCU028970 for ; Mon, 29 Jul 2019 13:13:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id B1BA85C22E; Mon, 29 Jul 2019 17:13:29 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 600A05C22B; Mon, 29 Jul 2019 17:13:13 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 29 Jul 2019 18:11:26 +0100 Message-Id: <20190729171130.25484-45-berrange@redhat.com> In-Reply-To: <20190729171130.25484-1-berrange@redhat.com> References: <20190729171130.25484-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH v3 44/48] util: change identity class attribute names 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 29 Jul 2019 17:13:32 +0000 (UTC) Change the identity class attribute names with a "UNIX" tag to have a more generic "OS" tag, since when we expose this in the public API we want it to be more flexible for the future. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Christophe de Dinechin --- src/access/viraccessdriverpolkit.c | 12 ++--- src/admin/admin_server.c | 10 ++-- src/libvirt_private.syms | 24 ++++----- src/rpc/virnetserverclient.c | 12 ++--- src/util/viridentity.c | 84 +++++++++++++++--------------- src/util/viridentity.h | 60 ++++++++++----------- tests/viridentitytest.c | 18 +++---- tests/virnetserverclienttest.c | 8 +-- 8 files changed, 114 insertions(+), 114 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdrive= rpolkit.c index b1473cd0a4..b98122d4a3 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -88,19 +88,19 @@ virAccessDriverPolkitGetCaller(const char *actionid, return -1; } =20 - if (virIdentityGetUNIXProcessID(identity, pid) < 0) { + if (virIdentityGetOSProcessID(identity, pid) < 0) { virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No UNIX process ID available")); + _("No OS process ID available")); goto cleanup; } - if (virIdentityGetUNIXProcessTime(identity, startTime) < 0) { + if (virIdentityGetOSProcessTime(identity, startTime) < 0) { virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No UNIX process start time available")); + _("No OS process start time available")); goto cleanup; } - if (virIdentityGetUNIXUserID(identity, uid) < 0) { + if (virIdentityGetOSUserID(identity, uid) < 0) { virAccessError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No UNIX caller UID available")); + _("No OS caller UID available")); goto cleanup; } =20 diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c index f2a38f6dfa..b92eb2fdc6 100644 --- a/src/admin/admin_server.c +++ b/src/admin/admin_server.c @@ -257,29 +257,29 @@ adminClientGetInfo(virNetServerClientPtr client, pid_t pid; uid_t uid; gid_t gid; - if (virIdentityGetUNIXUserID(identity, &uid) < 0 || + if (virIdentityGetOSUserID(identity, &uid) < 0 || virTypedParamsAddInt(&tmpparams, nparams, &maxparams, VIR_CLIENT_INFO_UNIX_USER_ID, uid) < 0) goto cleanup; =20 - if (virIdentityGetUNIXUserName(identity, &attr) < 0 || + if (virIdentityGetOSUserName(identity, &attr) < 0 || virTypedParamsAddString(&tmpparams, nparams, &maxparams, VIR_CLIENT_INFO_UNIX_USER_NAME, attr) < 0) goto cleanup; =20 - if (virIdentityGetUNIXGroupID(identity, &gid) < 0 || + if (virIdentityGetOSGroupID(identity, &gid) < 0 || virTypedParamsAddInt(&tmpparams, nparams, &maxparams, VIR_CLIENT_INFO_UNIX_GROUP_ID, gid) < 0) goto cleanup; =20 - if (virIdentityGetUNIXGroupName(identity, &attr) < 0 || + if (virIdentityGetOSGroupName(identity, &attr) < 0 || virTypedParamsAddString(&tmpparams, nparams, &maxparams, VIR_CLIENT_INFO_UNIX_GROUP_NAME, attr) < 0) goto cleanup; =20 - if (virIdentityGetUNIXProcessID(identity, &pid) < 0 || + if (virIdentityGetOSProcessID(identity, &pid) < 0 || virTypedParamsAddInt(&tmpparams, nparams, &maxparams, VIR_CLIENT_INFO_UNIX_PROCESS_ID, pid) < 0) goto cleanup; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c323f679b3..ac357583e4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2138,28 +2138,28 @@ virHostMemSetParameters; # util/viridentity.h virIdentityGetAttr; virIdentityGetCurrent; +virIdentityGetOSGroupID; +virIdentityGetOSGroupName; +virIdentityGetOSProcessID; +virIdentityGetOSProcessTime; +virIdentityGetOSUserID; +virIdentityGetOSUserName; virIdentityGetSASLUserName; virIdentityGetSELinuxContext; virIdentityGetSystem; -virIdentityGetUNIXGroupID; -virIdentityGetUNIXGroupName; -virIdentityGetUNIXProcessID; -virIdentityGetUNIXProcessTime; -virIdentityGetUNIXUserID; -virIdentityGetUNIXUserName; virIdentityGetX509DName; virIdentityIsEqual; virIdentityNew; virIdentitySetAttr; virIdentitySetCurrent; +virIdentitySetOSGroupID; +virIdentitySetOSGroupName; +virIdentitySetOSProcessID; +virIdentitySetOSProcessTime; +virIdentitySetOSUserID; +virIdentitySetOSUserName; virIdentitySetSASLUserName; virIdentitySetSELinuxContext; -virIdentitySetUNIXGroupID; -virIdentitySetUNIXGroupName; -virIdentitySetUNIXProcessID; -virIdentitySetUNIXProcessTime; -virIdentitySetUNIXUserID; -virIdentitySetUNIXUserName; virIdentitySetX509DName; =20 =20 diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 410de253d2..1f020a5a04 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -779,21 +779,21 @@ virNetServerClientCreateIdentity(virNetServerClientPt= r client) =20 if (!(username =3D virGetUserName(uid))) goto error; - if (virIdentitySetUNIXUserName(ret, username) < 0) + if (virIdentitySetOSUserName(ret, username) < 0) goto error; - if (virIdentitySetUNIXUserID(ret, uid) < 0) + if (virIdentitySetOSUserID(ret, uid) < 0) goto error; =20 if (!(groupname =3D virGetGroupName(gid))) goto error; - if (virIdentitySetUNIXGroupName(ret, groupname) < 0) + if (virIdentitySetOSGroupName(ret, groupname) < 0) goto error; - if (virIdentitySetUNIXGroupID(ret, gid) < 0) + if (virIdentitySetOSGroupID(ret, gid) < 0) goto error; =20 - if (virIdentitySetUNIXProcessID(ret, pid) < 0) + if (virIdentitySetOSProcessID(ret, pid) < 0) goto error; - if (virIdentitySetUNIXProcessTime(ret, timestamp) < 0) + if (virIdentitySetOSProcessTime(ret, timestamp) < 0) goto error; } =20 diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 4ceff3cb74..2c6c0ee91f 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -144,27 +144,27 @@ virIdentityPtr virIdentityGetSystem(void) if (!(ret =3D virIdentityNew())) goto error; =20 - if (virIdentitySetUNIXProcessID(ret, getpid()) < 0) + if (virIdentitySetOSProcessID(ret, getpid()) < 0) goto error; =20 if (virProcessGetStartTime(getpid(), &startTime) < 0) goto error; if (startTime !=3D 0 && - virIdentitySetUNIXProcessTime(ret, startTime) < 0) + virIdentitySetOSProcessTime(ret, startTime) < 0) goto error; =20 if (!(username =3D virGetUserName(geteuid()))) return ret; - if (virIdentitySetUNIXUserName(ret, username) < 0) + if (virIdentitySetOSUserName(ret, username) < 0) goto error; - if (virIdentitySetUNIXUserID(ret, getuid()) < 0) + if (virIdentitySetOSUserID(ret, getuid()) < 0) goto error; =20 if (!(groupname =3D virGetGroupName(getegid()))) return ret; - if (virIdentitySetUNIXGroupName(ret, groupname) < 0) + if (virIdentitySetOSGroupName(ret, groupname) < 0) goto error; - if (virIdentitySetUNIXGroupID(ret, getgid()) < 0) + if (virIdentitySetOSGroupID(ret, getgid()) < 0) goto error; =20 #if WITH_SELINUX @@ -310,24 +310,24 @@ bool virIdentityIsEqual(virIdentityPtr identA, } =20 =20 -int virIdentityGetUNIXUserName(virIdentityPtr ident, - const char **username) +int virIdentityGetOSUserName(virIdentityPtr ident, + const char **username) { return virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, username); } =20 =20 -int virIdentityGetUNIXUserID(virIdentityPtr ident, - uid_t *uid) +int virIdentityGetOSUserID(virIdentityPtr ident, + uid_t *uid) { int val; const char *userid; =20 *uid =3D -1; if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_ID, + VIR_IDENTITY_ATTR_OS_USER_ID, &userid) < 0) return -1; =20 @@ -342,24 +342,24 @@ int virIdentityGetUNIXUserID(virIdentityPtr ident, return 0; } =20 -int virIdentityGetUNIXGroupName(virIdentityPtr ident, - const char **groupname) +int virIdentityGetOSGroupName(virIdentityPtr ident, + const char **groupname) { return virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, + VIR_IDENTITY_ATTR_OS_GROUP_NAME, groupname); } =20 =20 -int virIdentityGetUNIXGroupID(virIdentityPtr ident, - gid_t *gid) +int virIdentityGetOSGroupID(virIdentityPtr ident, + gid_t *gid) { int val; const char *groupid; =20 *gid =3D -1; if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_GROUP_ID, + VIR_IDENTITY_ATTR_OS_GROUP_ID, &groupid) < 0) return -1; =20 @@ -375,15 +375,15 @@ int virIdentityGetUNIXGroupID(virIdentityPtr ident, } =20 =20 -int virIdentityGetUNIXProcessID(virIdentityPtr ident, - pid_t *pid) +int virIdentityGetOSProcessID(virIdentityPtr ident, + pid_t *pid) { unsigned long long val; const char *processid; =20 *pid =3D 0; if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, + VIR_IDENTITY_ATTR_OS_PROCESS_ID, &processid) < 0) return -1; =20 @@ -399,12 +399,12 @@ int virIdentityGetUNIXProcessID(virIdentityPtr ident, } =20 =20 -int virIdentityGetUNIXProcessTime(virIdentityPtr ident, - unsigned long long *timestamp) +int virIdentityGetOSProcessTime(virIdentityPtr ident, + unsigned long long *timestamp) { const char *processtime; if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, + VIR_IDENTITY_ATTR_OS_PROCESS_TIME, &processtime) < 0) return -1; =20 @@ -445,17 +445,17 @@ int virIdentityGetSELinuxContext(virIdentityPtr ident, } =20 =20 -int virIdentitySetUNIXUserName(virIdentityPtr ident, - const char *username) +int virIdentitySetOSUserName(virIdentityPtr ident, + const char *username) { return virIdentitySetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, username); } =20 =20 -int virIdentitySetUNIXUserID(virIdentityPtr ident, - uid_t uid) +int virIdentitySetOSUserID(virIdentityPtr ident, + uid_t uid) { VIR_AUTOFREE(char *) val =3D NULL; =20 @@ -463,22 +463,22 @@ int virIdentitySetUNIXUserID(virIdentityPtr ident, return -1; =20 return virIdentitySetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_ID, + VIR_IDENTITY_ATTR_OS_USER_ID, val); } =20 =20 -int virIdentitySetUNIXGroupName(virIdentityPtr ident, - const char *groupname) +int virIdentitySetOSGroupName(virIdentityPtr ident, + const char *groupname) { return virIdentitySetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, + VIR_IDENTITY_ATTR_OS_GROUP_NAME, groupname); } =20 =20 -int virIdentitySetUNIXGroupID(virIdentityPtr ident, - gid_t gid) +int virIdentitySetOSGroupID(virIdentityPtr ident, + gid_t gid) { VIR_AUTOFREE(char *) val =3D NULL; =20 @@ -486,13 +486,13 @@ int virIdentitySetUNIXGroupID(virIdentityPtr ident, return -1; =20 return virIdentitySetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_GROUP_ID, + VIR_IDENTITY_ATTR_OS_GROUP_ID, val); } =20 =20 -int virIdentitySetUNIXProcessID(virIdentityPtr ident, - pid_t pid) +int virIdentitySetOSProcessID(virIdentityPtr ident, + pid_t pid) { VIR_AUTOFREE(char *) val =3D NULL; =20 @@ -500,13 +500,13 @@ int virIdentitySetUNIXProcessID(virIdentityPtr ident, return -1; =20 return virIdentitySetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, + VIR_IDENTITY_ATTR_OS_PROCESS_ID, val); } =20 =20 -int virIdentitySetUNIXProcessTime(virIdentityPtr ident, - unsigned long long timestamp) +int virIdentitySetOSProcessTime(virIdentityPtr ident, + unsigned long long timestamp) { VIR_AUTOFREE(char *) val =3D NULL; =20 @@ -514,7 +514,7 @@ int virIdentitySetUNIXProcessTime(virIdentityPtr ident, return -1; =20 return virIdentitySetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, + VIR_IDENTITY_ATTR_OS_PROCESS_TIME, val); } =20 diff --git a/src/util/viridentity.h b/src/util/viridentity.h index 0fde3207ca..4b87506373 100644 --- a/src/util/viridentity.h +++ b/src/util/viridentity.h @@ -27,12 +27,12 @@ typedef struct _virIdentity virIdentity; typedef virIdentity *virIdentityPtr; =20 typedef enum { - VIR_IDENTITY_ATTR_UNIX_USER_NAME, - VIR_IDENTITY_ATTR_UNIX_USER_ID, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, - VIR_IDENTITY_ATTR_UNIX_GROUP_ID, - VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, - VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, + VIR_IDENTITY_ATTR_OS_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_ID, + VIR_IDENTITY_ATTR_OS_GROUP_NAME, + VIR_IDENTITY_ATTR_OS_GROUP_ID, + VIR_IDENTITY_ATTR_OS_PROCESS_ID, + VIR_IDENTITY_ATTR_OS_PROCESS_TIME, VIR_IDENTITY_ATTR_SASL_USER_NAME, VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME, VIR_IDENTITY_ATTR_SELINUX_CONTEXT, @@ -64,18 +64,18 @@ bool virIdentityIsEqual(virIdentityPtr identA, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 -int virIdentityGetUNIXUserName(virIdentityPtr ident, - const char **username); -int virIdentityGetUNIXUserID(virIdentityPtr ident, - uid_t *uid); -int virIdentityGetUNIXGroupName(virIdentityPtr ident, - const char **groupname); -int virIdentityGetUNIXGroupID(virIdentityPtr ident, - gid_t *gid); -int virIdentityGetUNIXProcessID(virIdentityPtr ident, - pid_t *pid); -int virIdentityGetUNIXProcessTime(virIdentityPtr ident, - unsigned long long *timestamp); +int virIdentityGetOSUserName(virIdentityPtr ident, + const char **username); +int virIdentityGetOSUserID(virIdentityPtr ident, + uid_t *uid); +int virIdentityGetOSGroupName(virIdentityPtr ident, + const char **groupname); +int virIdentityGetOSGroupID(virIdentityPtr ident, + gid_t *gid); +int virIdentityGetOSProcessID(virIdentityPtr ident, + pid_t *pid); +int virIdentityGetOSProcessTime(virIdentityPtr ident, + unsigned long long *timestamp); int virIdentityGetSASLUserName(virIdentityPtr ident, const char **username); int virIdentityGetX509DName(virIdentityPtr ident, @@ -84,18 +84,18 @@ int virIdentityGetSELinuxContext(virIdentityPtr ident, const char **context); =20 =20 -int virIdentitySetUNIXUserName(virIdentityPtr ident, - const char *username); -int virIdentitySetUNIXUserID(virIdentityPtr ident, - uid_t uid); -int virIdentitySetUNIXGroupName(virIdentityPtr ident, - const char *groupname); -int virIdentitySetUNIXGroupID(virIdentityPtr ident, - gid_t gid); -int virIdentitySetUNIXProcessID(virIdentityPtr ident, - pid_t pid); -int virIdentitySetUNIXProcessTime(virIdentityPtr ident, - unsigned long long timestamp); +int virIdentitySetOSUserName(virIdentityPtr ident, + const char *username); +int virIdentitySetOSUserID(virIdentityPtr ident, + uid_t uid); +int virIdentitySetOSGroupName(virIdentityPtr ident, + const char *groupname); +int virIdentitySetOSGroupID(virIdentityPtr ident, + gid_t gid); +int virIdentitySetOSProcessID(virIdentityPtr ident, + pid_t pid); +int virIdentitySetOSProcessTime(virIdentityPtr ident, + unsigned long long timestamp); int virIdentitySetSASLUserName(virIdentityPtr ident, const char *username); int virIdentitySetX509DName(virIdentityPtr ident, diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index b60d944d8e..64b511c272 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -46,12 +46,12 @@ static int testIdentityAttrs(const void *data ATTRIBUTE= _UNUSED) goto cleanup; =20 if (virIdentitySetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, "fred") < 0) goto cleanup; =20 if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, &val) < 0) goto cleanup; =20 @@ -61,7 +61,7 @@ static int testIdentityAttrs(const void *data ATTRIBUTE_U= NUSED) } =20 if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, + VIR_IDENTITY_ATTR_OS_GROUP_NAME, &val) < 0) goto cleanup; =20 @@ -71,14 +71,14 @@ static int testIdentityAttrs(const void *data ATTRIBUTE= _UNUSED) } =20 if (virIdentitySetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, "joe") !=3D -1) { VIR_DEBUG("Unexpectedly overwrote attribute"); goto cleanup; } =20 if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, &val) < 0) goto cleanup; =20 @@ -111,7 +111,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE= _UNUSED) } =20 if (virIdentitySetAttr(identa, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, "fred") < 0) goto cleanup; =20 @@ -121,7 +121,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE= _UNUSED) } =20 if (virIdentitySetAttr(identb, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, "fred") < 0) goto cleanup; =20 @@ -131,11 +131,11 @@ static int testIdentityEqual(const void *data ATTRIBU= TE_UNUSED) } =20 if (virIdentitySetAttr(identa, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, + VIR_IDENTITY_ATTR_OS_GROUP_NAME, "flintstone") < 0) goto cleanup; if (virIdentitySetAttr(identb, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, + VIR_IDENTITY_ATTR_OS_GROUP_NAME, "flintstone") < 0) goto cleanup; =20 diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index cb5071b2d9..280bd24227 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -86,7 +86,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUS= ED) } =20 if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_NAME, + VIR_IDENTITY_ATTR_OS_USER_NAME, &gotUsername) < 0) { fprintf(stderr, "Missing username in identity\n"); goto cleanup; @@ -98,7 +98,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUS= ED) } =20 if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_USER_ID, + VIR_IDENTITY_ATTR_OS_USER_ID, &gotUserID) < 0) { fprintf(stderr, "Missing user ID in identity\n"); goto cleanup; @@ -110,7 +110,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UN= USED) } =20 if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_GROUP_NAME, + VIR_IDENTITY_ATTR_OS_GROUP_NAME, &gotGroupname) < 0) { fprintf(stderr, "Missing groupname in identity\n"); goto cleanup; @@ -122,7 +122,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UN= USED) } =20 if (virIdentityGetAttr(ident, - VIR_IDENTITY_ATTR_UNIX_GROUP_ID, + VIR_IDENTITY_ATTR_OS_GROUP_ID, &gotGroupID) < 0) { fprintf(stderr, "Missing group ID in identity\n"); goto cleanup; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list