Imported Upstream version 1.2.4 upstream/1.2.4

7 files changed, 96 insertions, 0 deletions

diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index c6f4ba26..3f6bf9e6 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -330,6 +330,7 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@
 NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
 NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml
index c2a0f068..bbe7bebe 100644
--- a/introspection/nm-ip4-config.xml
+++ b/introspection/nm-ip4-config.xml
@@ -77,6 +77,13 @@
     <property name="DnsOptions" type="as" access="read"/>
 
     <!--
+        DnsPriority:
+
+        The relative priority of DNS servers.
+    -->
+    <property name="DnsPriority" type="i" access="read"/>
+
+    <!--
         WinsServers:
 
         The Windows Internet Name Service servers associated with the connection.
diff --git a/introspection/nm-ip6-config.xml b/introspection/nm-ip6-config.xml
index 606761dd..a58bfffa 100644
--- a/introspection/nm-ip6-config.xml
+++ b/introspection/nm-ip6-config.xml
@@ -77,6 +77,13 @@
     <property name="DnsOptions" type="as" access="read"/>
 
     <!--
+        DnsPriority:
+
+        The relative priority of DNS servers.
+    -->
+    <property name="DnsPriority" type="i" access="read"/>
+
+    <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
     -->
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index e5cb23a5..ea368ba3 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -4,6 +4,34 @@
     <annotation name="org.gtk.GDBus.C.Name" value="Manager"/>
 
     <!--
+        Reload:
+        @flags: optional flags to specify which parts shall be reloaded.
+
+        Reload NetworkManager's configuration and perform certain updates, like flushing a cache or
+        rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it
+        allows for more fine-grained control over what to reload (see @flags). It also allows
+        non-root access via PolicyKit and contrary to signals it is synchronous.
+
+        No flags (0x00) means to reload everything that is supported which is identical to
+        sending a SIGHUP.
+        (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this
+        does not include connections, which can be reloaded via Setting's ReloadConnections.
+        (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf
+        anew.
+        (0x04) means to restart the DNS plugin. This is for example useful when using
+        dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d.
+        If you edit those files, you can restart the DNS plugin. This action shortly interrupts
+        rename resolution.
+        Note that flags may affect each other. For example, restarting the DNS plugin (0x04)
+        implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes
+        to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting
+        the DNS plugin (0x02), unless an entirely different plugin is selected.
+    -->
+    <method name="Reload">
+      <arg name="flags" type="u" direction="in"/>
+    </method>
+
+    <!--
         GetDevices:
         @devices: List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).
 
diff --git a/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml b/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
index 4383ae42..1656207a 100644
--- a/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
+++ b/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
@@ -23,6 +23,7 @@
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains">Domains</link>      readable   as
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches">Searches</link>     readable   as
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions">DnsOptions</link>   readable   as
+<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority">DnsPriority</link>  readable   i
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers">WinsServers</link>  readable   au
 </synopsis>
   </refsect1>
@@ -141,6 +142,15 @@ DnsOptions  readable   as
         resolv.conf(5) manual page for the list of supported options.
 </para>
 </refsect2>
+<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority">
+  <title>The "DnsPriority" property</title>
+  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority"><primary sortas=".IP4Config:DnsPriority">org.freedesktop.NetworkManager.IP4Config:DnsPriority</primary></indexterm>
+<programlisting>
+DnsPriority  readable   i
+</programlisting>
+<para>        The relative priority of DNS servers.
+</para>
+</refsect2>
 <refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers">
   <title>The "WinsServers" property</title>
   <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers"><primary sortas=".IP4Config:WinsServers">org.freedesktop.NetworkManager.IP4Config:WinsServers</primary></indexterm>
diff --git a/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml b/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml
index 80dd9b4f..5afd98b9 100644
--- a/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml
+++ b/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml
@@ -23,6 +23,7 @@
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains">Domains</link>      readable   as
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches">Searches</link>     readable   as
 <link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions">DnsOptions</link>   readable   as
+<link linkend="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority">DnsPriority</link>  readable   i
 </synopsis>
   </refsect1>
 <refsect1 role="desc" id="gdbus-interface-org-freedesktop-NetworkManager-IP6Config">
@@ -135,6 +136,15 @@ DnsOptions  readable   as
         resolv.conf(5) manual page for the list of supported options.
 </para>
 </refsect2>
+<refsect2 role="property" id="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority">
+  <title>The "DnsPriority" property</title>
+  <indexterm zone="gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority"><primary sortas=".IP6Config:DnsPriority">org.freedesktop.NetworkManager.IP6Config:DnsPriority</primary></indexterm>
+<programlisting>
+DnsPriority  readable   i
+</programlisting>
+<para>        The relative priority of DNS servers.
+</para>
+</refsect2>
 </refsect1>
 </refentry>
 
diff --git a/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml b/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml
index 26b499bb..993f9f10 100644
--- a/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml
+++ b/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml
@@ -8,6 +8,7 @@
   </refmeta>  <refnamediv>    <refname>org.freedesktop.NetworkManager</refname>    <refpurpose></refpurpose>  </refnamediv>  <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
     <synopsis>
+<link linkend="gdbus-method-org-freedesktop-NetworkManager.Reload">Reload</link>                   (IN  u         flags);
 <link linkend="gdbus-method-org-freedesktop-NetworkManager.GetDevices">GetDevices</link>               (OUT ao        devices);
 <link linkend="gdbus-method-org-freedesktop-NetworkManager.GetAllDevices">GetAllDevices</link>            (OUT ao        devices);
 <link linkend="gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface">GetDeviceByIpIface</link>       (IN  s         iface,
@@ -73,6 +74,38 @@
 </refsect1>
 <refsect1 role="details" id="gdbus-methods-org.freedesktop.NetworkManager">
   <title role="details.title">Method Details</title>
+<refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.Reload">
+  <title>The Reload() method</title>
+  <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.Reload"><primary sortas="Manager.Reload">org.freedesktop.NetworkManager.Reload()</primary></indexterm>
+<programlisting>
+Reload (IN  u flags);
+</programlisting>
+<para>        Reload NetworkManager's configuration and perform certain updates, like flushing a cache or
+        rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it
+        allows for more fine-grained control over what to reload (see <parameter>flags</parameter>). It also allows
+        non-root access via PolicyKit and contrary to signals it is synchronous.
+</para><para>        No flags (0x00) means to reload everything that is supported which is identical to
+        sending a SIGHUP.
+        (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this
+        does not include connections, which can be reloaded via Setting's ReloadConnections.
+        (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf
+        anew.
+        (0x04) means to restart the DNS plugin. This is for example useful when using
+        dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d.
+        If you edit those files, you can restart the DNS plugin. This action shortly interrupts
+        rename resolution.
+        Note that flags may affect each other. For example, restarting the DNS plugin (0x04)
+        implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes
+        to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting
+        the DNS plugin (0x02), unless an entirely different plugin is selected.
+</para>
+<variablelist role="params">
+<varlistentry>
+  <term><literal>IN u <parameter>flags</parameter></literal>:</term>
+  <listitem><para>optional flags to specify which parts shall be reloaded.</para></listitem>
+</varlistentry>
+</variablelist>
+</refsect2>
 <refsect2 role="method" id="gdbus-method-org-freedesktop-NetworkManager.GetDevices">
   <title>The GetDevices() method</title>
   <indexterm zone="gdbus-method-org-freedesktop-NetworkManager.GetDevices"><primary sortas="Manager.GetDevices">org.freedesktop.NetworkManager.GetDevices()</primary></indexterm>