From 99f67a4e55596baefd908656b3ac86e38755dc9b Mon Sep 17 00:00:00 2001
From: Vincent Mihalkovic <vmihalko@redhat.com>
Date: Thu, 10 Oct 2024 15:35:19 +0200
Subject: [PATCH] (re: 6c5705e0d36a8b893cf2d0f888d88b0c7c19edc9): Update docs
 and adjust the LOG_LEVEL (#508)

---
 docs/man/polkit.xml                           | 34 +++++++++++--------
 .../polkitbackendduktapeauthority.c           |  2 +-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/docs/man/polkit.xml b/docs/man/polkit.xml
index 8d503bd..77c8b15 100644
--- a/docs/man/polkit.xml
+++ b/docs/man/polkit.xml
@@ -477,27 +477,31 @@ System Context         |                        |
   <refsect1 id="polkit-rules"><title>AUTHORIZATION RULES</title>
     <para>
       <command>polkitd</command> reads
-      <filename class='extension'>.rules</filename> files from the
-      <filename class='directory'>/etc/polkit-1/rules.d</filename> and
-      <filename class='directory'>/usr/share/polkit-1/rules.d</filename>
-      directories by sorting the files in lexical order based on the
-      basename on each file (if there's a tie, files in
-      <filename class='directory'>/etc</filename>
-      are processed before files in
-      <filename class='directory'>/usr</filename>).
-      For example, for the following four
-      files, the order is
+      <filename class='extension'>.rules</filename> files from the following
+      directories in this order:
+    </para>
+    <itemizedlist mark='opencircle' spacing='compact'>
+      <listitem><para><filename>/etc/polkit-1/rules.d</filename></para></listitem>
+      <listitem><para><filename>/run/polkit-1/rules.d</filename></para></listitem>
+      <listitem><para><filename>/usr/local/share/polkit-1/rules.d</filename></para></listitem>
+      <listitem><para><filename>/usr/share/polkit-1/rules.d</filename></para></listitem>
+    </itemizedlist>
+    <para>
+      These directories are processed in lexical order based on the basename
+      of each file. If there's a tie, files in directories earlier in the
+      list are processed first. For example, for the following four
+      files, the order is:
     </para>
     <itemizedlist mark='opencircle' spacing='compact'>
       <listitem><para><filename>/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
+      <listitem><para><filename>/run/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
+      <listitem><para><filename>/usr/local/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
       <listitem><para><filename>/usr/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
-      <listitem><para><filename>/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem>
-      <listitem><para><filename>/usr/share/polkit-1/rules.d/20-auth.rules</filename></para></listitem>
     </itemizedlist>
     <para>
-      Both directories are monitored so if a rules file is changed,
-      added or removed, existing rules are purged and all files are
-      read and processed again.  Rules files are written in the
+      All of these directories are monitored, so if a rules file is changed,
+      added, or removed, existing rules are purged and all files are
+      read and processed again. Rules files are written in the
       <ulink url="http://en.wikipedia.org/wiki/JavaScript">JavaScript</ulink>
       programming language and interface with <command>polkitd</command>
       through the global
diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c
index ce63423..87c1d15 100644
--- a/src/polkitbackend/polkitbackendduktapeauthority.c
+++ b/src/polkitbackend/polkitbackendduktapeauthority.c
@@ -134,7 +134,7 @@ load_scripts (PolkitBackendJsAuthority  *authority)
       else
         {
           polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
-                                        LOG_LEVEL_DEBUG,
+                                        LOG_LEVEL_NOTICE,
                                         "Error opening rules directory: %s (%s, %d)",
                                         error->message, g_quark_to_string (error->domain), error->code);
           g_clear_error (&error);