util: make generic identity accessors private

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>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b1f379110812ad2a35b12da3ccc7e18852ea2c10..0ac4a562e7050d06d571f8f8c9091c6ecf226179 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2142,7 +2142,6 @@ virHostGetBootTime;
 
 
 # util/viridentity.h
-virIdentityGetAttr;
 virIdentityGetCurrent;
 virIdentityGetGroupName;
 virIdentityGetProcessID;
@@ -2156,7 +2155,6 @@ virIdentityGetUserName;
 virIdentityGetX509DName;
 virIdentityIsEqual;
 virIdentityNew;
-virIdentitySetAttr;
 virIdentitySetCurrent;
 virIdentitySetGroupName;
 virIdentitySetProcessID;

diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index d920152c0862b84e51dcbd1963d1f1eb47ab52bf..abb486c87f9553e46f5f2295c24dbdc23db19e4d 100644 (file)
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -41,6 +41,20 @@
 
 VIR_LOG_INIT("util.identity");
 
+typedef enum {
+      VIR_IDENTITY_ATTR_USER_NAME,
+      VIR_IDENTITY_ATTR_UNIX_USER_ID,
+      VIR_IDENTITY_ATTR_GROUP_NAME,
+      VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
+      VIR_IDENTITY_ATTR_PROCESS_ID,
+      VIR_IDENTITY_ATTR_PROCESS_TIME,
+      VIR_IDENTITY_ATTR_SASL_USER_NAME,
+      VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
+      VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
+
+      VIR_IDENTITY_ATTR_LAST,
+} virIdentityAttrType;
+
 struct _virIdentity {
     virObject parent;
 
@@ -233,9 +247,10 @@ static void virIdentityDispose(void *object)
  *
  * Returns: 0 on success, or -1 on error
  */
-int virIdentitySetAttr(virIdentityPtr ident,
-                       unsigned int attr,
-                       const char *value)
+static int
+virIdentitySetAttr(virIdentityPtr ident,
+                   unsigned int attr,
+                   const char *value)
 {
     int ret = -1;
     VIR_DEBUG("ident=%p attribute=%u value=%s", ident, attr, value);
@@ -269,9 +284,10 @@ int virIdentitySetAttr(virIdentityPtr ident,
  *
  * Returns 0 on success, -1 on error
  */
-int virIdentityGetAttr(virIdentityPtr ident,
-                       unsigned int attr,
-                       const char **value)
+static int
+virIdentityGetAttr(virIdentityPtr ident,
+                   unsigned int attr,
+                   const char **value)
 {
     VIR_DEBUG("ident=%p attribute=%d value=%p", ident, attr, value);
 

diff --git a/src/util/viridentity.h b/src/util/viridentity.h
index e66e60dbf37efcb8ec061bb41ef8fc4eba101757..e243284cd52edbff46c97a6479fae5e34dd6c9d3 100644 (file)
--- a/src/util/viridentity.h
+++ b/src/util/viridentity.h
@@ -26,20 +26,6 @@
 typedef struct _virIdentity virIdentity;
 typedef virIdentity *virIdentityPtr;
 
-typedef enum {
-      VIR_IDENTITY_ATTR_USER_NAME,
-      VIR_IDENTITY_ATTR_UNIX_USER_ID,
-      VIR_IDENTITY_ATTR_GROUP_NAME,
-      VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
-      VIR_IDENTITY_ATTR_PROCESS_ID,
-      VIR_IDENTITY_ATTR_PROCESS_TIME,
-      VIR_IDENTITY_ATTR_SASL_USER_NAME,
-      VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
-      VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
-
-      VIR_IDENTITY_ATTR_LAST,
-} virIdentityAttrType;
-
 virIdentityPtr virIdentityGetCurrent(void);
 int virIdentitySetCurrent(virIdentityPtr ident);
 
@@ -47,17 +33,6 @@ virIdentityPtr virIdentityGetSystem(void);
 
 virIdentityPtr virIdentityNew(void);
 
-int virIdentitySetAttr(virIdentityPtr ident,
-                       unsigned int attr,
-                       const char *value)
-    ATTRIBUTE_NONNULL(1)
-    ATTRIBUTE_NONNULL(3);
-
-int virIdentityGetAttr(virIdentityPtr ident,
-                       unsigned int attr,
-                       const char **value)
-    ATTRIBUTE_NONNULL(1)
-    ATTRIBUTE_NONNULL(3);
 
 bool virIdentityIsEqual(virIdentityPtr identA,
                         virIdentityPtr identB)

diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index 3c9eb8683a303c2433a806fa960b7f9d67a89975..cdf5325b4c7a9f47dbdeaa19da6ca58d5bc8d18a 100644 (file)
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -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)) {

diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c
index aaecfe7987c447fd39b792d400be9e4576a67245..3cd76f42ff6a0bde7c735c2e1165e1b19f7be51e 100644 (file)
--- a/tests/virnetserverclienttest.c
+++ b/tests/virnetserverclienttest.c
@@ -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;
     }