Rename "security context" to "selinux context"

There are various methods named "virXXXXSecurityContext",
which are specific to SELinux. Rename them all to
"virXXXXSELinuxContext". They will still raise errors at
runtime if SELinux is not compiled in

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d4cb4a3b589a1461953a5409992775102cfb09f7..babdde7c5b0d95e0991264c1d709689c661fc2fc 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -862,7 +862,7 @@ virNetServerClientGetFD;
 virNetServerClientGetIdentity;
 virNetServerClientGetPrivateData;
 virNetServerClientGetReadonly;
-virNetServerClientGetSecurityContext;
+virNetServerClientGetSELinuxContext;
 virNetServerClientGetUNIXIdentity;
 virNetServerClientImmediateClose;
 virNetServerClientInit;
@@ -933,7 +933,7 @@ virNetSocketClose;
 virNetSocketDupFD;
 virNetSocketGetFD;
 virNetSocketGetPort;
-virNetSocketGetSecurityContext;
+virNetSocketGetSELinuxContext;
 virNetSocketGetUNIXIdentity;
 virNetSocketHasCachedData;
 virNetSocketHasPassFD;

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 2bde5c74e59ddda3420bce276a6b8455907522f0..5abf7b0d9a286e596898e2cbfa8cfe11127e7f73 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -701,7 +701,7 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
 #endif
 
     if (client->sock &&
-        virNetSocketGetSecurityContext(client->sock, &seccontext) < 0)
+        virNetSocketGetSELinuxContext(client->sock, &seccontext) < 0)
         goto cleanup;
 
     if (!(ret = virIdentityNew()))
@@ -736,7 +736,7 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
         goto error;
     if (seccontext &&
         virIdentitySetAttr(ret,
-                           VIR_IDENTITY_ATTR_SECURITY_CONTEXT,
+                           VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
                            seccontext) < 0)
         goto error;
 
@@ -771,14 +771,14 @@ virIdentityPtr virNetServerClientGetIdentity(virNetServerClientPtr client)
 }
 
 
-int virNetServerClientGetSecurityContext(virNetServerClientPtr client,
-                                         char **context)
+int virNetServerClientGetSELinuxContext(virNetServerClientPtr client,
+                                        char **context)
 {
     int ret = 0;
     *context = NULL;
     virObjectLock(client);
     if (client->sock)
-        ret = virNetSocketGetSecurityContext(client->sock, context);
+        ret = virNetSocketGetSELinuxContext(client->sock, context);
     virObjectUnlock(client);
     return ret;
 }

diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index b3b8df0bf963b7febd277649b35820c9417b4e74..85369941f938849a1eb99d1e8917fec91b85292a 100644 (file)
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -101,8 +101,8 @@ bool virNetServerClientIsLocal(virNetServerClientPtr client);
 int virNetServerClientGetUNIXIdentity(virNetServerClientPtr client,
                                       uid_t *uid, gid_t *gid, pid_t *pid);
 
-int virNetServerClientGetSecurityContext(virNetServerClientPtr client,
-                                         char **context);
+int virNetServerClientGetSELinuxContext(virNetServerClientPtr client,
+                                        char **context);
 
 virIdentityPtr virNetServerClientGetIdentity(virNetServerClientPtr client);
 

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index dcf98b1e933c18f2673c83a6ca0fbea05c24d223..eb88e274656aced0294d4e0d5b8b619bddcb53b9 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -1161,8 +1161,8 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,
 #endif
 
 #ifdef WITH_SELINUX
-int virNetSocketGetSecurityContext(virNetSocketPtr sock,
-                                   char **context)
+int virNetSocketGetSELinuxContext(virNetSocketPtr sock,
+                                  char **context)
 {
     security_context_t seccon = NULL;
     int ret = -1;
@@ -1192,8 +1192,8 @@ cleanup:
     return ret;
 }
 #else
-int virNetSocketGetSecurityContext(virNetSocketPtr sock ATTRIBUTE_UNUSED,
-                                   char **context)
+int virNetSocketGetSELinuxContext(virNetSocketPtr sock ATTRIBUTE_UNUSED,
+                                  char **context)
 {
     *context = NULL;
     return 0;

diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index 7392c722bf33e9336d81e2acca7988fc9b2290fc..7bced141e7d4240a8761d9d4f7178b653e49fdc8 100644 (file)
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -114,8 +114,8 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
                                 uid_t *uid,
                                 gid_t *gid,
                                 pid_t *pid);
-int virNetSocketGetSecurityContext(virNetSocketPtr sock,
-                                   char **context);
+int virNetSocketGetSELinuxContext(virNetSocketPtr sock,
+                                  char **context);
 
 int virNetSocketSetBlocking(virNetSocketPtr sock,
                             bool blocking);

diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index c9efd3ffe2a590eccb910df8b21662c622980149..840485af94eba8119aab9703a7e130e3d7736f6d 100644 (file)
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -173,7 +173,7 @@ virIdentityPtr virIdentityGetSystem(void)
         goto error;
     if (seccontext &&
         virIdentitySetAttr(ret,
-                           VIR_IDENTITY_ATTR_SECURITY_CONTEXT,
+                           VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
                            seccontext) < 0)
         goto error;
 

diff --git a/src/util/viridentity.h b/src/util/viridentity.h
index 39ab20ef9ee62eadd0a6f993c00671cc77052255..d7293be4433de766807b5978e358c024e9ad777d 100644 (file)
--- a/src/util/viridentity.h
+++ b/src/util/viridentity.h
@@ -33,7 +33,7 @@ typedef enum {
       VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
       VIR_IDENTITY_ATTR_SASL_USER_NAME,
       VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
-      VIR_IDENTITY_ATTR_SECURITY_CONTEXT,
+      VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
 
       VIR_IDENTITY_ATTR_LAST,
 } virIdentityAttrType;