PolicyKit: Branch 'master'

[David Zeuthen]

 src/polkit/polkit-policy-file.c           |    4 ++--
 test/test-invalid-1-action-id.policy      |    2 +-
 test/test-invalid-2-bogus-any.policy      |    2 +-
 test/test-invalid-3-bogus-inactive.policy |    2 +-
 test/test-invalid-4-bogus-active.policy   |    2 +-
 test/test-invalid-5-max-depth.policy      |    2 +-
 test/test-valid-1.policy                  |    2 +-
 test/test-valid-2-annotations.policy      |    2 +-
 test/test-valid-3-lang.policy             |    4 ++--
 test/test-valid-4-unknown-tags.policy     |    2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 0a43c4ec9a91cbb3318791efc69230b822a5e0e3
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Nov 8 14:20:58 2007 -0500

    use unique action names

diff --git a/src/polkit/polkit-policy-file.c b/src/polkit/polkit-policy-file.c
index a894e0f..0873965 100644
--- a/src/polkit/polkit-policy-file.c
+++ b/src/polkit/polkit-policy-file.c
@@ -675,7 +675,7 @@ _check_pf (PolKitPolicyFile *pf, PolKitPolicyFileEntry *pfe, void *user_data)
         }
         
 
-        if (strcmp (polkit_policy_file_entry_get_id (pfe), "org.example") == 0) {
+        if (strcmp (polkit_policy_file_entry_get_id (pfe), "org.example.valid3") == 0) {
                 if (is_danish) {
                         desc = "example (danish)";
                         msg = "message (danish)";
@@ -690,7 +690,7 @@ _check_pf (PolKitPolicyFile *pf, PolKitPolicyFileEntry *pfe, void *user_data)
                     strcmp (r_msg, msg) == 0) 
                         *counter += 1;
 
-        }  else if (strcmp (polkit_policy_file_entry_get_id (pfe), "org.example2") == 0) {
+        }  else if (strcmp (polkit_policy_file_entry_get_id (pfe), "org.example.valid3b") == 0) {
                 if (is_danish) {
                         desc = "example 2 (danish)";
                         msg = "message 2 (danish)";
diff --git a/test/test-invalid-1-action-id.policy b/test/test-invalid-1-action-id.policy
index 102d346..0875d5f 100644
--- a/test/test-invalid-1-action-id.policy
+++ b/test/test-invalid-1-action-id.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <policyconfig>
 
-  <action id="4org.example">
+  <action id="4org.example.invalid1">
     <description>foo</description>
     <message>bar</message>
     <defaults>
diff --git a/test/test-invalid-2-bogus-any.policy b/test/test-invalid-2-bogus-any.policy
index 87b3862..529e2c5 100644
--- a/test/test-invalid-2-bogus-any.policy
+++ b/test/test-invalid-2-bogus-any.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <policyconfig>
 
-  <action id="org.example">
+  <action id="org.example.invalid2">
     <description>foo</description>
     <message>bar</message>
     <defaults>
diff --git a/test/test-invalid-3-bogus-inactive.policy b/test/test-invalid-3-bogus-inactive.policy
index 8306a83..555976d 100644
--- a/test/test-invalid-3-bogus-inactive.policy
+++ b/test/test-invalid-3-bogus-inactive.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <policyconfig>
 
-  <action id="org.example">
+  <action id="org.example.invalid3">
     <description>foo</description>
     <message>bar</message>
     <defaults>
diff --git a/test/test-invalid-4-bogus-active.policy b/test/test-invalid-4-bogus-active.policy
index 1d2bcef..0f82e7b 100644
--- a/test/test-invalid-4-bogus-active.policy
+++ b/test/test-invalid-4-bogus-active.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <policyconfig>
 
-  <action id="org.example">
+  <action id="org.example.invalid4">
     <description>foo</description>
     <message>bar</message>
     <defaults>
diff --git a/test/test-invalid-5-max-depth.policy b/test/test-invalid-5-max-depth.policy
index f6e923d..1dd1520 100644
--- a/test/test-invalid-5-max-depth.policy
+++ b/test/test-invalid-5-max-depth.policy
@@ -74,7 +74,7 @@
     </future>
   </future>
 
-  <action id="4org.example">
+  <action id="org.example.invalid5">
     <description>foo</description>
     <message>bar</message>
     <defaults>
diff --git a/test/test-valid-1.policy b/test/test-valid-1.policy
index b89c826..24bd602 100644
--- a/test/test-valid-1.policy
+++ b/test/test-valid-1.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <policyconfig>
 
-  <action id="org.example">
+  <action id="org.example.valid1">
     <description>example</description>
     <message>example</message>
     <defaults>
diff --git a/test/test-valid-2-annotations.policy b/test/test-valid-2-annotations.policy
index 06bc95e..e58ea9b 100644
--- a/test/test-valid-2-annotations.policy
+++ b/test/test-valid-2-annotations.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <policyconfig>
 
-  <action id="org.example">
+  <action id="org.example.valid2">
     <description>example 2</description>
     <message>message 2</message>
     <defaults>
diff --git a/test/test-valid-3-lang.policy b/test/test-valid-3-lang.policy
index e7b7ca5..c13bd14 100644
--- a/test/test-valid-3-lang.policy
+++ b/test/test-valid-3-lang.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <policyconfig>
 
-  <action id="org.example">
+  <action id="org.example.valid3">
     <description>example</description>
     <message>message</message>
     <description xml:lang="da">example (danish)</description>
@@ -13,7 +13,7 @@
     </defaults>
   </action>
 
-  <action id="org.example2">
+  <action id="org.example.valid3b">
     <description>example 2</description>
     <message>message 2</message>
     <description xml:lang="da">example 2 (danish)</description>
diff --git a/test/test-valid-4-unknown-tags.policy b/test/test-valid-4-unknown-tags.policy
index ba18b37..af0ba07 100644
--- a/test/test-valid-4-unknown-tags.policy
+++ b/test/test-valid-4-unknown-tags.policy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <policyconfig>
 
-  <action id="org.example">
+  <action id="org.example.valid4">
     <description>example</description>
     <message>example</message>
     <defaults>