about summary refs log tree commit diff
path: root/clients/common/settings-docs.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2019-11-06 20:46:28 +0100
committerMichael Biebl <biebl@debian.org>2019-11-06 20:46:28 +0100
commit515e1311d22086215e182f18a4529f24660ca4c3 (patch)
tree5b1d21eeceaa57d233d46ddfeeca5e0c1fc8b8a3 /clients/common/settings-docs.h
parent790e3946f0274a272fdda4d8697ce31a757a48d2 (diff)
parent9c642eac191ef0dce49855d8da0a9e9af18d5113 (diff)
Update upstream source from tag 'upstream/1.20.6'
Update to upstream version '1.20.6'
with Debian dir 93035bdc0e2b22e7410d6c70c55a21648f836a2f
Diffstat (limited to 'clients/common/settings-docs.h')
-rw-r--r--clients/common/settings-docs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h
index c4f16ad6..b81cee71 100644
--- a/clients/common/settings-docs.h
+++ b/clients/common/settings-docs.h
@@ -54,6 +54,7 @@
 #define DESCRIBE_DOC_NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH N_("Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_EAP N_("The allowed EAP method to be used when authenticating to the network with 802.1x.  Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", \"pwd\", and \"fast\".  Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_IDENTITY N_("Identity string for EAP authentication methods.  Often the user's user or login name.")
+#define DESCRIBE_DOC_NM_SETTING_802_1X_OPTIONAL N_("Whether the 802.1X authentication is optional. If TRUE, the activation will continue even after a timeout or an authentication failure. Setting the property to TRUE is currently allowed only for Ethernet connections. If set to FALSE, the activation can continue only after a successful authentication.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PAC_FILE N_("UTF-8 encoded file path containing PAC for EAP-FAST.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PASSWORD N_("UTF-8 encoded password used for EAP authentication methods. If both the \"password\" property and the \"password-raw\" property are specified, \"password\" is preferred.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PASSWORD_FLAGS N_("Flags indicating how to handle the \"password\" property.")