fixup! Update tests golden files and assets

ubuntu · Dec 2, 2024 · 49185ad · 49185ad
1 parent 0707b7e
commit 49185ad
Show file tree

Hide file tree

Showing 118 changed files with 129 additions and 23 deletions.
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/...ns/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules b/...ns/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
diff --git a/...al-admins-multi/sudoers.d/40-local-admins → ...ient_admins/etc/sudoers.d/40-local-admins b/...al-admins-multi/sudoers.d/40-local-admins → ...ient_admins/etc/sudoers.d/40-local-admins
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...dmin_conf_(simple)_and_set_client_admins/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...dmin_conf_(simple)_and_set_client_admins/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/...ns/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules b/...ns/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
diff --git a/...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules b/...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
diff --git a/...with-adsys-file/sudoers.d/40-local-admins → ...ient_admins/etc/sudoers.d/40-local-admins b/...with-adsys-file/sudoers.d/40-local-admins → ...ient_admins/etc/sudoers.d/40-local-admins
diff --git a/...al-admins-multi/sudoers.d/50-local-admins → ...ient_admins/etc/sudoers.d/50-local-admins b/...al-admins-multi/sudoers.d/50-local-admins → ...ient_admins/etc/sudoers.d/50-local-admins
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/..._(with_adsys_file)_and_set_client_admins/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/..._(with_adsys_file)_and_set_client_admins/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...dmin_conf_and_set_client_admins/etc/polkit-1/rules.d/00-adsys-privilege-enforcement.rules b/...dmin_conf_and_set_client_admins/etc/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+polkit.addAdminRule(function(action, subject){
+	return ["unix-user:local40admin1","unix-user:local40admin2","unix-user:[email protected]"];
+});
diff --git a/...ns/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules b/...ns/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
diff --git a/...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules b/...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
diff --git a/...admins_with_previous_local_admin_conf_and_set_client_admins/etc/sudoers.d/40-local-admins b/...admins_with_previous_local_admin_conf_and_set_client_admins/etc/sudoers.d/40-local-admins
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+"[email protected]"	ALL=(ALL:ALL) ALL
+"[email protected]"	ALL=(ALL:ALL) ALL
+
diff --git a/...ocal-admins-one/sudoers.d/50-local-admins → ...ient_admins/etc/sudoers.d/50-local-admins b/...ocal-admins-one/sudoers.d/50-local-admins → ...ient_admins/etc/sudoers.d/50-local-admins
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...s_local_admin_conf_and_set_client_admins/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...s_local_admin_conf_and_set_client_admins/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf b/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf
diff --git a/...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf b/...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf b/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...n_new_polkit_version_and_remove_old_file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...n_new_polkit_version_and_remove_old_file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
@@ -3,5 +3,5 @@
 # Any changes will be overwritten.
 
 polkit.addAdminRule(function(action, subject){
-	return ["unix-group:sudo","unix-group:admin","unix-user:[email protected]"];
+	return ["unix-user:[email protected]"];
 });
diff --git a/...ti/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules b/...ti/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
diff --git a/...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules b/...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
diff --git a/...admins_with_previous_local_admin_conf_and_set_client_admins/etc/sudoers.d/40-local-admins b/...admins_with_previous_local_admin_conf_and_set_client_admins/etc/sudoers.d/40-local-admins
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+"[email protected]"	ALL=(ALL:ALL) ALL
+"[email protected]"	ALL=(ALL:ALL) ALL
+
diff --git a/...with-adsys-file/sudoers.d/50-local-admins → ...ient_admins/etc/sudoers.d/50-local-admins b/...with-adsys-file/sudoers.d/50-local-admins → ...ient_admins/etc/sudoers.d/50-local-admins
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...s_local_admin_conf_and_set_client_admins/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...s_local_admin_conf_and_set_client_admins/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/...ing_files/polkit-1/rules.d/notadsys.rules → ...files/etc/polkit-1/rules.d/notadsys.rules b/...ing_files/polkit-1/rules.d/notadsys.rules → ...files/etc/polkit-1/rules.d/notadsys.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...e_other_existing_files/sudoers.d/notadsys → ...her_existing_files/etc/sudoers.d/notadsys b/...e_other_existing_files/sudoers.d/notadsys → ...her_existing_files/etc/sudoers.d/notadsys
diff --git a/...den/don't_overwrite_other_existing_files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...den/don't_overwrite_other_existing_files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...no_existing_history_means_no_files/.empty → ...e_those_files/etc/polkit-1/rules.d/.empty b/...no_existing_history_means_no_files/.empty → ...e_those_files/etc/polkit-1/rules.d/.empty
diff --git a/...write_those_files/polkit-1/rules.d/.empty → ...verwrite_those_files/etc/sudoers.d/.empty b/...write_those_files/polkit-1/rules.d/.empty → ...verwrite_those_files/etc/sudoers.d/.empty
diff --git a/...den/no_rules_still_overwrite_those_files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...den/no_rules_still_overwrite_those_files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/..._computer/polkit-1/rules.d/notadsys.rules → ...puter/etc/polkit-1/rules.d/notadsys.rules b/..._computer/polkit-1/rules.d/notadsys.rules → ...puter/etc/polkit-1/rules.d/notadsys.rules
diff --git a/.../golden/not_a_computer/sudoers.d/notadsys → ...den/not_a_computer/etc/sudoers.d/notadsys b/.../golden/not_a_computer/sudoers.d/notadsys → ...den/not_a_computer/etc/sudoers.d/notadsys
diff --git a/...ta/TestApplyPolicy/golden/not_a_computer/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...ta/TestApplyPolicy/golden/not_a_computer/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...cy/golden/overwrite_existing_polkit_file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...cy/golden/overwrite_existing_polkit_file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...y/golden/overwrite_existing_sudoers_file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...y/golden/overwrite_existing_sudoers_file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
@@ -3,5 +3,5 @@
 # Any changes will be overwritten.
 
 polkit.addAdminRule(function(action, subject){
-	return ["unix-group:sudo","unix-group:admin","unix-user:alice@domain.com"];
+	return ["unix-group:[email protected]"];
 });
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
@@ -3,5 +3,5 @@
 # Any changes will be overwritten.
 
 polkit.addAdminRule(function(action, subject){
-	return ["unix-group:sudo","unix-group:admin","unix-user:alice@domain.com"];
+	return ["unix-user:[email protected]","unix-group:group@domain.com"];
 });
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...t_mixed_with_users_and_group_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules b/...t_mixed_with_users_and_group_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
diff --git a/...et_client_multiple_users_admins/etc/polkit-1/rules.d/00-adsys-privilege-enforcement.rules b/...et_client_multiple_users_admins/etc/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+polkit.addAdminRule(function(action, subject){
+	return ["unix-user:[email protected]","unix-user:bob@domain","unix-user:carole [email protected]"];
+});
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...en/set_client_multiple_users_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules b/...en/set_client_multiple_users_admins/polkit-1/rules.d/00-adsys-privilege-enforcement.rules
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
@@ -3,5 +3,5 @@
 # Any changes will be overwritten.
 
 polkit.addAdminRule(function(action, subject){
-	return ["unix-group:sudo","unix-group:admin","unix-group:group@domain.com"];
+	return ["unix-user:alice@domain.com"];
 });
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...ege/testdata/TestPolkitAdminIdentitiesFromRules/golden/consider_only_first_returned_value b/...ege/testdata/TestPolkitAdminIdentitiesFromRules/golden/consider_only_first_returned_value
@@ -1 +1 @@
-"unix-user:local50admin1","unix-user:local50admin2"
+"unix-user:local40admin1","unix-user:local40admin2"
diff --git a/...vilege/testdata/TestPolkitAdminIdentitiesFromRules/golden/fetch_previous_admin_identities b/...vilege/testdata/TestPolkitAdminIdentitiesFromRules/golden/fetch_previous_admin_identities
@@ -1 +1 @@
-"unix-user:local50admin1","unix-user:local50admin2"
+"unix-user:local40admin1","unix-user:local40admin2"
diff --git a/...ll_overwrite_those_files/sudoers.d/.empty → ...es.d/00-adsys-privilege-enforcement.rules b/...ll_overwrite_those_files/sudoers.d/.empty → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/internal/policies/privilege/testdata/existing-files/polkit-1/rules.d/.empty b/internal/policies/privilege/testdata/existing-files/polkit-1/rules.d/.empty
diff --git a/...licies/privilege/testdata/existing-files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...licies/privilege/testdata/existing-files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf b/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf
diff --git a/...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf b/...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...ivilege/testdata/existing-old-adsys-conf/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...ivilege/testdata/existing-old-adsys-conf/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...her-files/polkit-1/rules.d/notadsys.rules → ...files/etc/polkit-1/rules.d/notadsys.rules b/...her-files/polkit-1/rules.d/notadsys.rules → ...files/etc/polkit-1/rules.d/notadsys.rules
diff --git a/...a/existing-other-files/sudoers.d/notadsys → ...isting-other-files/etc/sudoers.d/notadsys b/...a/existing-other-files/sudoers.d/notadsys → ...isting-other-files/etc/sudoers.d/notadsys
diff --git a/.../privilege/testdata/existing-other-files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/.../privilege/testdata/existing-other-files/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...le/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules b/...le/polkit-1/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
diff --git a/...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules b/...ns/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
diff --git a/...ies/privilege/testdata/existing-previous-local-admins-multi/etc/sudoers.d/40-local-admins b/...ies/privilege/testdata/existing-previous-local-admins-multi/etc/sudoers.d/40-local-admins
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+"[email protected]"	ALL=(ALL:ALL) ALL
+"[email protected]"	ALL=(ALL:ALL) ALL
+
diff --git a/...ies/privilege/testdata/existing-previous-local-admins-multi/etc/sudoers.d/50-local-admins b/...ies/privilege/testdata/existing-previous-local-admins-multi/etc/sudoers.d/50-local-admins
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+"[email protected]"	ALL=(ALL:ALL) ALL
+"[email protected]"	ALL=(ALL:ALL) ALL
+
diff --git a/...ata/existing-previous-local-admins-multi/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...ata/existing-previous-local-admins-multi/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...le/polkit-2/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules b/...le/polkit-2/rules.d/40-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
diff --git a/...icies/privilege/testdata/existing-previous-local-admins-one/etc/sudoers.d/40-local-admins b/...icies/privilege/testdata/existing-previous-local-admins-one/etc/sudoers.d/40-local-admins
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+"[email protected]"	ALL=(ALL:ALL) ALL
+"[email protected]"	ALL=(ALL:ALL) ALL
+
diff --git a/...tdata/existing-previous-local-admins-one/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...tdata/existing-previous-local-admins-one/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...ly/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules b/...ly/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
@@ -3,7 +3,7 @@
 # Any changes will be overwritten.
 
 polkit.addAdminRule(function(action, subject) {
-    return ["unix-user:local50admin1", "unix-user:local50admin2"];
+    return ["unix-user:local40admin1", "unix-user:local40admin2"];
 });
 
 polkit.addAdminRule(function(action, subject) {

diff --git a/...sting-previous-local-admins-return-early/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...sting-previous-local-admins-return-early/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules b/...es.d/00-adsys-privilege-enforcement.rules → ...es.d/00-adsys-privilege-enforcement.rules
diff --git a/...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules b/...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/40-local-admins.rules
@@ -3,5 +3,5 @@
 # Any changes will be overwritten.
 
 polkit.addAdminRule(function(action, subject) {
-    return ["unix-user:local50admin1", "unix-user:local50admin2"];
+    return ["unix-user:local40admin1", "unix-user:local40admin2"];
 });
diff --git a/...ti/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules b/...ti/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
diff --git a/...ege/testdata/existing-previous-local-admins-with-adsys-file/etc/sudoers.d/40-local-admins b/...ege/testdata/existing-previous-local-admins-with-adsys-file/etc/sudoers.d/40-local-admins
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+"[email protected]"	ALL=(ALL:ALL) ALL
+"[email protected]"	ALL=(ALL:ALL) ALL
+
diff --git a/...ege/testdata/existing-previous-local-admins-with-adsys-file/etc/sudoers.d/50-local-admins b/...ege/testdata/existing-previous-local-admins-with-adsys-file/etc/sudoers.d/50-local-admins
@@ -0,0 +1,7 @@
+# This file is managed by adsys.
+# Do not edit this file manually.
+# Any changes will be overwritten.
+
+"[email protected]"	ALL=(ALL:ALL) ALL
+"[email protected]"	ALL=(ALL:ALL) ALL
+
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...ng-previous-local-admins-with-adsys-file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...ng-previous-local-admins-with-adsys-file/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...50-this-is-not-a-file.rules/somethinginit → ...50-this-is-not-a-file.rules/somethinginit b/...50-this-is-not-a-file.rules/somethinginit → ...50-this-is-not-a-file.rules/somethinginit
diff --git a/...testdata/incorrect-policikit-conf-is-dir/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/...testdata/incorrect-policikit-conf-is-dir/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
diff --git a/...ne/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules b/...ne/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
diff --git a/...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-2/rules.d/40-local-admins.rules b/...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-2/rules.d/40-local-admins.rules
@@ -3,5 +3,5 @@
 # Any changes will be overwritten.
 
 polkit.addAdminRule(function(action, subject) {
-    return ["unix-user:local50admin1", "unix-user:local50admin2"];
+    return ["unix-user:local40admin1", "unix-user:local40admin2"];
 });
diff --git a/...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules b/...le/polkit-1/rules.d/50-local-admins.rules → ...tc/polkit-1/rules.d/50-local-admins.rules
diff --git a/...le/polkit-2/rules.d/50-local-admins.rules → ...tc/polkit-2/rules.d/50-local-admins.rules b/...le/polkit-2/rules.d/50-local-admins.rules → ...tc/polkit-2/rules.d/50-local-admins.rules
diff --git a/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf b/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf
diff --git a/...kit-1/localauthority.conf.d/75-admin.conf → ...kit-1/localauthority.conf.d/75-admin.conf b/...kit-1/localauthority.conf.d/75-admin.conf → ...kit-1/localauthority.conf.d/75-admin.conf
diff --git a/...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf b/...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf b/...ocalauthority.conf.d/50-ubuntu-admin.conf → ...ocalauthority.conf.d/50-ubuntu-admin.conf
diff --git a/...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf b/...onf.d/99-adsys-privilege-enforcement.conf → ...onf.d/99-adsys-privilege-enforcement.conf
diff --git a/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement b/.../sudoers.d/99-adsys-privilege-enforcement → .../sudoers.d/99-adsys-privilege-enforcement
diff --git a/...sting_polkit_file/polkit-1/rules.d/.empty → .../only-base-polkit-dir/etc/polkit-1/.empty b/...sting_polkit_file/polkit-1/rules.d/.empty → .../only-base-polkit-dir/etc/polkit-1/.empty
diff --git a/internal/policies/privilege/testdata/only-base-polkit-dir/polkit-1/.empty b/internal/policies/privilege/testdata/only-base-polkit-dir/polkit-1/.empty
diff --git a/.../privilege/testdata/only-base-polkit-dir/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules b/.../privilege/testdata/only-base-polkit-dir/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules
@@ -0,0 +1,3 @@
+polkit.addAdminRule(function(action, subject) {
+	return ["unix-group:sudo", "unix-group:admin"];
+});
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		"unix-user:local50admin1","unix-user:local50admin2"
		"unix-user:local40admin1","unix-user:local40admin2"