conf: Revert changes to add new secret type "passphrase"

Revert the remainder of commit id 'c84380106'

diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in
index 4d0307d0d7dff9b81913c145270fd49db3129b33..dae0814a828d92db34748bca84e0aae05174d7c3 100644 (file)
--- a/docs/aclpolkit.html.in
+++ b/docs/aclpolkit.html.in
@@ -224,10 +224,6 @@
           <td>secret_usage_target</td>
           <td>Name of the associated iSCSI target, if any</td>
         </tr>
-        <tr>
-          <td>secret_usage_name</td>
-          <td>Name of be associated passphrase secret, if any</td>
-        </tr>
       </tbody>
     </table>
 

diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng
index cac8560fe87dc768c2562916465707b51065524d..e21e7003253d8ab75ef40720039384fd32bf1fcd 100644 (file)
--- a/docs/schemas/secret.rng
+++ b/docs/schemas/secret.rng
@@ -36,7 +36,6 @@
               <ref name='usagevolume'/>
               <ref name='usageceph'/>
               <ref name='usageiscsi'/>
-              <ref name='usagepassphrase'/>
               <!-- More choices later -->
             </choice>
           </element>
@@ -72,13 +71,4 @@
     </element>
   </define>
 
-  <define name='usagepassphrase'>
-    <attribute name='type'>
-      <value>passphrase</value>
-    </attribute>
-    <element name='name'>
-      <ref name='genericName'/>
-    </element>
-  </define>
-
 </grammar>

diff --git a/include/libvirt/libvirt-secret.h b/include/libvirt/libvirt-secret.h
index 55b11e05f0b276cc4729355ced5309809384a863..02728ba6cd41d7edd0d558ab40af1662d1872a0c 100644 (file)
--- a/include/libvirt/libvirt-secret.h
+++ b/include/libvirt/libvirt-secret.h
@@ -43,7 +43,6 @@ typedef enum {
     VIR_SECRET_USAGE_TYPE_VOLUME = 1,
     VIR_SECRET_USAGE_TYPE_CEPH = 2,
     VIR_SECRET_USAGE_TYPE_ISCSI = 3,
-    VIR_SECRET_USAGE_TYPE_PASSPHRASE = 4,
 
 # ifdef VIR_ENUM_SENTINELS
     VIR_SECRET_USAGE_TYPE_LAST

diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c
index 99b867f9e827715b1d06bdadbb67e6863ff6e9f7..89bc8908f234d2424b360f76dcd39f229a615949 100644 (file)
--- a/src/access/viraccessdriverpolkit.c
+++ b/src/access/viraccessdriverpolkit.c
@@ -338,19 +338,6 @@ virAccessDriverPolkitCheckSecret(virAccessManagerPtr manager,
                                           virAccessPermSecretTypeToString(perm),
                                           attrs);
     }   break;
-    case VIR_SECRET_USAGE_TYPE_PASSPHRASE: {
-        const char *attrs[] = {
-            "connect_driver", driverName,
-            "secret_uuid", uuidstr,
-            "secret_usage_name", secret->usage.name,
-            NULL,
-        };
-
-        return virAccessDriverPolkitCheck(manager,
-                                          "secret",
-                                          virAccessPermSecretTypeToString(perm),
-                                          attrs);
-    }   break;
     }
 }
 

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index a973aa9199e99747d32ee1307467e148ffc72cde..d510645496b9e0e272f6c5d3fdf04958745fb000 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -29,7 +29,6 @@
 #include "viralloc.h"
 #include "secret_conf.h"
 #include "virsecretobj.h"
-#include "virstring.h"
 #include "virerror.h"
 #include "virxml.h"
 #include "viruuid.h"
@@ -39,7 +38,7 @@
 VIR_LOG_INIT("conf.secret_conf");
 
 VIR_ENUM_IMPL(virSecretUsage, VIR_SECRET_USAGE_TYPE_LAST,
-              "none", "volume", "ceph", "iscsi", "passphrase")
+              "none", "volume", "ceph", "iscsi")
 
 const char *
 virSecretUsageIDForDef(virSecretDefPtr def)
@@ -57,9 +56,6 @@ virSecretUsageIDForDef(virSecretDefPtr def)
     case VIR_SECRET_USAGE_TYPE_ISCSI:
         return def->usage.target;
 
-    case VIR_SECRET_USAGE_TYPE_PASSPHRASE:
-        return def->usage.name;
-
     default:
         return NULL;
     }
@@ -89,10 +85,6 @@ virSecretDefFree(virSecretDefPtr def)
         VIR_FREE(def->usage.target);
         break;
 
-    case VIR_SECRET_USAGE_TYPE_PASSPHRASE:
-        VIR_FREE(def->usage.name);
-        break;
-
     default:
         VIR_ERROR(_("unexpected secret usage type %d"), def->usage_type);
         break;
@@ -153,14 +145,6 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt,
         }
         break;
 
-    case VIR_SECRET_USAGE_TYPE_PASSPHRASE:
-        if (!(def->usage.name = virXPathString("string(./usage/name)", ctxt))) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("passphrase usage specified, but name is missing"));
-            return -1;
-        }
-        break;
-
     default:
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected secret usage type %d"),
@@ -313,10 +297,6 @@ virSecretDefFormatUsage(virBufferPtr buf,
         virBufferEscapeString(buf, "<target>%s</target>\n", def->usage.target);
         break;
 
-    case VIR_SECRET_USAGE_TYPE_PASSPHRASE:
-        virBufferEscapeString(buf, "<name>%s</name>\n", def->usage.name);
-        break;
-
     default:
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected secret usage type %d"),

diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index c34880fb099319f5f838f5d3cc4cf93de08050ba..4584403dcb47f50c5f4bb1ac8f504ef6f5105089 100644 (file)
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -40,7 +40,6 @@ struct _virSecretDef {
         char *volume;               /* May be NULL */
         char *ceph;
         char *target;
-        char *name;
     } usage;
 };
 

diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index 6714a0075c63eef3aa1790937d64609f435f0264..30a5e80f6e40f8e5147a85fc805877894996990b 100644 (file)
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -237,11 +237,6 @@ virSecretObjSearchName(const void *payload,
         if (STREQ(secret->def->usage.target, data->usageID))
             found = 1;
         break;
-
-    case VIR_SECRET_USAGE_TYPE_PASSPHRASE:
-        if (STREQ(secret->def->usage.name, data->usageID))
-            found = 1;
-        break;
     }
 
  cleanup:

diff --git a/tests/secretxml2xmlin/usage-passphrase.xml b/tests/secretxml2xmlin/usage-passphrase.xml
deleted file mode 100644 (file)
index 2b94b80..0000000
--- a/tests/secretxml2xmlin/usage-passphrase.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<secret ephemeral='no' private='no'>
-  <uuid>f52a81b2-424e-490c-823d-6bd4235bc572</uuid>
-  <description>Sample Passphrase Secret</description>
-  <usage type='passphrase'>
-    <name>mumblyfratz</name>
-  </usage>
-</secret>

diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c
index c444e4d29badbcd3c9d5677be1612ad2d672cffb..8dcbb40080b7e1d89c57d628e5033d2cbb47f2e6 100644 (file)
--- a/tests/secretxml2xmltest.c
+++ b/tests/secretxml2xmltest.c
@@ -80,7 +80,6 @@ mymain(void)
     DO_TEST("usage-volume");
     DO_TEST("usage-ceph");
     DO_TEST("usage-iscsi");
-    DO_TEST("usage-passphrase");
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }