NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: make generic identity accessors private

Browse Source 
Only expose the type safe getters/setters to other code in preparation
for changing the internal storage of data.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé
2019-07-26 12:21:29 +01:00
parent 3caf033916
commit 1bbc53c264
5 changed files with 46 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/viridentitytest.c
View File

@@ -45,14 +45,10 @@ static int testIdentityAttrs(const void *data ATTRIBUTE_UNUSED)
if (!(ident = virIdentityNew()))
goto cleanup;
if (virIdentitySetAttr(ident,
VIR_IDENTITY_ATTR_USER_NAME,
"fred") < 0)
if (virIdentitySetUserName(ident, "fred") < 0)
goto cleanup;
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_USER_NAME,
&val) < 0)
if (virIdentityGetUserName(ident, &val) < 0)
goto cleanup;
if (STRNEQ_NULLABLE(val, "fred")) {
@@ -60,9 +56,7 @@ static int testIdentityAttrs(const void *data ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_GROUP_NAME,
&val) < 0)
if (virIdentityGetGroupName(ident, &val) < 0)
goto cleanup;
if (val != NULL) {
@@ -70,16 +64,12 @@ static int testIdentityAttrs(const void *data ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentitySetAttr(ident,
VIR_IDENTITY_ATTR_USER_NAME,
"joe") != -1) {
if (virIdentitySetUserName(ident, "joe") >= 0) {
VIR_DEBUG("Unexpectedly overwrote attribute");
goto cleanup;
}
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_USER_NAME,
&val) < 0)
if (virIdentityGetUserName(ident, &val) < 0)
goto cleanup;
if (STRNEQ_NULLABLE(val, "fred")) {
@@ -110,9 +100,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentitySetAttr(identa,
VIR_IDENTITY_ATTR_USER_NAME,
"fred") < 0)
if (virIdentitySetUserName(identa, "fred") < 0)
goto cleanup;
if (virIdentityIsEqual(identa, identb)) {
@@ -120,9 +108,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentitySetAttr(identb,
VIR_IDENTITY_ATTR_USER_NAME,
"fred") < 0)
if (virIdentitySetUserName(identb, "fred") < 0)
goto cleanup;
if (!virIdentityIsEqual(identa, identb)) {
@@ -130,13 +116,9 @@ static int testIdentityEqual(const void *data ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentitySetAttr(identa,
VIR_IDENTITY_ATTR_GROUP_NAME,
"flintstone") < 0)
if (virIdentitySetGroupName(identa, "flintstone") < 0)
goto cleanup;
if (virIdentitySetAttr(identb,
VIR_IDENTITY_ATTR_GROUP_NAME,
"flintstone") < 0)
if (virIdentitySetGroupName(identb, "flintstone") < 0)
goto cleanup;
if (!virIdentityIsEqual(identa, identb)) {
@@ -144,9 +126,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentitySetAttr(identb,
VIR_IDENTITY_ATTR_SASL_USER_NAME,
"fred@FLINTSTONE.COM") < 0)
if (virIdentitySetSASLUserName(identb, "fred@FLINTSTONE.COM") < 0)
goto cleanup;
if (virIdentityIsEqual(identa, identb)) {
@@ -181,9 +161,7 @@ static int testIdentityGetSystem(const void *data)
goto cleanup;
}
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
&val) < 0)
if (virIdentityGetSELinuxContext(ident, &val) < 0)
goto cleanup;
if (STRNEQ_NULLABLE(val, context)) {

36
tests/virnetserverclienttest.c
View File

@@ -53,9 +53,9 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUSED)
virNetServerClientPtr client = NULL;
virIdentityPtr ident = NULL;
const char *gotUsername = NULL;
const char *gotUserID = NULL;
uid_t gotUserID;
const char *gotGroupname = NULL;
const char *gotGroupID = NULL;
gid_t gotGroupID;
const char *gotSELinuxContext = NULL;
if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) < 0) {
@@ -85,9 +85,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_USER_NAME,
&gotUsername) < 0) {
if (virIdentityGetUserName(ident, &gotUsername) < 0) {
fprintf(stderr, "Missing username in identity\n");
goto cleanup;
}
@@ -97,21 +95,17 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_UNIX_USER_ID,
&gotUserID) < 0) {
if (virIdentityGetUNIXUserID(ident, &gotUserID) < 0) {
fprintf(stderr, "Missing user ID in identity\n");
goto cleanup;
}
if (STRNEQ_NULLABLE("666", gotUserID)) {
fprintf(stderr, "Want username '666' got '%s'\n",
NULLSTR(gotUserID));
if (666 != gotUserID) {
fprintf(stderr, "Want username '666' got '%llu'\n",
(unsigned long long)gotUserID);
goto cleanup;
}
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_GROUP_NAME,
&gotGroupname) < 0) {
if (virIdentityGetGroupName(ident, &gotGroupname) < 0) {
fprintf(stderr, "Missing groupname in identity\n");
goto cleanup;
}
@@ -121,21 +115,17 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup;
}
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
&gotGroupID) < 0) {
if (virIdentityGetUNIXGroupID(ident, &gotGroupID) < 0) {
fprintf(stderr, "Missing group ID in identity\n");
goto cleanup;
}
if (STRNEQ_NULLABLE("7337", gotGroupID)) {
fprintf(stderr, "Want groupname '7337' got '%s'\n",
NULLSTR(gotGroupID));
if (7337 != gotGroupID) {
fprintf(stderr, "Want groupname '7337' got '%llu'\n",
(unsigned long long)gotGroupID);
goto cleanup;
}
if (virIdentityGetAttr(ident,
VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
&gotSELinuxContext) < 0) {
if (virIdentityGetSELinuxContext(ident, &gotSELinuxContext) < 0) {
fprintf(stderr, "Missing SELinux context in identity\n");
goto cleanup;
}