Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream

1 files changed, 70 insertions, 3 deletions

diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index d950232c..eec09bbe 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -700,6 +700,14 @@
 <a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-auth-timeout" title="nm_setting_802_1x_get_auth_timeout ()">nm_setting_802_1x_get_auth_timeout</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSetting8021x.html#nm-setting-802-1x-get-optional" title="nm_setting_802_1x_get_optional ()">nm_setting_802_1x_get_optional</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -786,6 +794,11 @@
 <td class="property_flags">Read / Write</td>
 </tr>
 <tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="NMSetting8021x.html#NMSetting8021x--optional" title="The “optional” property">optional</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
 <td class="property_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
 <td class="property_name"><a class="link" href="NMSetting8021x.html#NMSetting8021x--pac-file" title="The “pac-file” property">pac-file</a></td>
@@ -1173,6 +1186,10 @@
 <td class="function_name"><a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-AUTH-TIMEOUT:CAPS" title="NM_SETTING_802_1X_AUTH_TIMEOUT">NM_SETTING_802_1X_AUTH_TIMEOUT</a></td>
 </tr>
 <tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-OPTIONAL:CAPS" title="NM_SETTING_802_1X_OPTIONAL">NM_SETTING_802_1X_OPTIONAL</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword"> </td>
 <td class="function_name"><a class="link" href="NMSetting8021x.html#NMSetting8021x-struct" title="NMSetting8021x">NMSetting8021x</a></td>
 </tr>
@@ -1182,9 +1199,10 @@
 <div class="refsect1">
 <a name="NMSetting8021x.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
-    <span class="lineart">├──</span> NMSetting8021xAuthFlags
     <span class="lineart">├──</span> NMSetting8021xCKFormat
     <span class="lineart">╰──</span> NMSetting8021xCKScheme
+    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+    <span class="lineart">╰──</span> NMSetting8021xAuthFlags
     <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
         <span class="lineart">╰──</span> NMSetting8021x
@@ -4053,6 +4071,34 @@ global default value.</p>
 </div>
 <p class="since">Since: 1.8</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-802-1x-get-optional"></a><h3>nm_setting_802_1x_get_optional ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+nm_setting_802_1x_get_optional (<em class="parameter"><code><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> *setting</code></em>);</pre>
+<p>Returns the value contained in the <a class="link" href="NMSetting8021x.html#NMSetting8021x--optional" title="The “optional” property"><span class="type">“optional”</span></a> property.</p>
+<div class="refsect3">
+<a name="nm-setting-802-1x-get-optional.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-802-1x-get-optional.returns"></a><h4>Returns</h4>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the activation should proceed even when the 802.1X
+authentication fails; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+</div>
+<p class="since">Since: 1.22</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSetting8021x.other_details"></a><h2>Types and Values</h2>
@@ -4171,6 +4217,8 @@ URI of an object on a PKCS<span class="type">11</span> token</p>
 <a name="NMSetting8021xAuthFlags"></a><h3>enum NMSetting8021xAuthFlags</h3>
 <p><a class="link" href="NMSetting8021x.html#NMSetting8021xAuthFlags" title="enum NMSetting8021xAuthFlags"><span class="type">NMSetting8021xAuthFlags</span></a> values indicate which authentication settings
 should be used.</p>
+<p>Before 1.22, this was wrongly marked as a enum and not as a flags
+type.</p>
 <div class="refsect3">
 <a name="NMSetting8021xAuthFlags.members"></a><h4>Members</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -4492,6 +4540,12 @@ should be used.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-802-1X-OPTIONAL:CAPS"></a><h3>NM_SETTING_802_1X_OPTIONAL</h3>
+<pre class="programlisting">#define NM_SETTING_802_1X_OPTIONAL "optional"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021x-struct"></a><h3>NMSetting8021x</h3>
 <pre class="programlisting">typedef struct _NMSetting8021x NMSetting8021x;</pre>
 <p>IEEE 802.1x Authentication Settings</p>
@@ -4645,6 +4699,19 @@ login name.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSetting8021x--optional"></a><h3>The <code class="literal">“optional”</code> property</h3>
+<pre class="programlisting">  “optional”                 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
+<p>Whether the 802.1X authentication is optional. If <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, the activation
+will continue even after a timeout or an authentication failure. Setting
+the property to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> is currently allowed only for Ethernet connections.
+If set to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, the activation can continue only after a successful
+authentication.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: FALSE</p>
+<p class="since">Since: 1.22</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSetting8021x--pac-file"></a><h3>The <code class="literal">“pac-file”</code> property</h3>
 <pre class="programlisting">  “pac-file”                 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</pre>
 <p>UTF-8 encoded file path containing PAC for EAP-FAST.</p>
@@ -4750,7 +4817,7 @@ server certificate's altSubjectName is performed.</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-auth"></a><h3>The <code class="literal">“phase2-auth”</code> property</h3>
 <pre class="programlisting">  “phase2-auth”              <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</pre>
-<p>Specifies the allowed "phase 2" inner non-EAP authentication methods when
+<p>Specifies the allowed "phase 2" inner non-EAP authentication method when
 an EAP method that uses an inner TLS tunnel is specified in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.  Recognized non-EAP "phase 2" methods are
 "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls".
@@ -4763,7 +4830,7 @@ authentication; see the wpa_supplicant documentation for more details.</p>
 <div class="refsect2">
 <a name="NMSetting8021x--phase2-autheap"></a><h3>The <code class="literal">“phase2-autheap”</code> property</h3>
 <pre class="programlisting">  “phase2-autheap”           <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</pre>
-<p>Specifies the allowed "phase 2" inner EAP-based authentication methods
+<p>Specifies the allowed "phase 2" inner EAP-based authentication method
 when an EAP method that uses an inner TLS tunnel is specified in the
 <a class="link" href="NMSetting8021x.html#NMSetting8021x--eap" title="The “eap” property"><span class="type">“eap”</span></a> property.  Recognized EAP-based "phase 2" methods are
 "md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method