Imported Upstream version 5.3.3

6 files changed, 10 insertions, 10 deletions

diff --git a/conf/options/charon.conf b/conf/options/charon.conf
index bd8e29940..5f27b08e3 100644
--- a/conf/options/charon.conf
+++ b/conf/options/charon.conf
@@ -176,8 +176,8 @@ charon {
     # Number of times to retransmit a packet before giving up.
     # retransmit_tries = 5
 
-    # Interval to use when retrying to initiate an IKE_SA (e.g. if DNS
-    # resolution failed), 0 to disable retries.
+    # Interval in seconds to use when retrying to initiate an IKE_SA (e.g. if
+    # DNS resolution failed), 0 to disable retries.
     # retry_initiate_interval = 0
 
     # Initiate CHILD_SA within existing IKE_SAs.
diff --git a/conf/options/charon.opt b/conf/options/charon.opt
index bbc50ba37..5d137aee8 100644
--- a/conf/options/charon.opt
+++ b/conf/options/charon.opt
@@ -271,8 +271,8 @@ charon.retransmit_tries = 5
 	Number of times to retransmit a packet before giving up.
 
 charon.retry_initiate_interval = 0
-	Interval to use when retrying to initiate an IKE_SA (e.g. if DNS resolution
-	failed), 0 to disable retries.
+	Interval in seconds to use when retrying to initiate an IKE_SA (e.g. if DNS
+	resolution failed), 0 to disable retries.
 
 charon.reuse_ikesa = yes
 	Initiate CHILD_SA within existing IKE_SAs.
diff --git a/conf/options/imcv.conf b/conf/options/imcv.conf
index 92016ef52..bc1f183fc 100644
--- a/conf/options/imcv.conf
+++ b/conf/options/imcv.conf
@@ -16,6 +16,9 @@ charon {
 
         os_info {
 
+            # Manually set whether a default password is enabled
+            # default_password_enabled = no
+
             # Manually set the name of the client OS (e.g. Ubuntu).
             # name =
 
diff --git a/conf/options/imcv.opt b/conf/options/imcv.opt
index a249a7b14..33ab74bd5 100644
--- a/conf/options/imcv.opt
+++ b/conf/options/imcv.opt
@@ -15,6 +15,9 @@ charon.imcv.os_info.name =
 charon.imcv.os_info.version =
 	Manually set the version of the client OS (e.g. 12.04 i686).
 
+charon.imcv.os_info.default_password_enabled = no
+	Manually set whether a default password is enabled
+
 charon.imcv.policy_script = ipsec _imv_policy
 	Script called for each TNC connection to generate IMV policies.
 
diff --git a/conf/options/starter.conf b/conf/options/starter.conf
index 447397b0d..5cdcbfdd2 100644
--- a/conf/options/starter.conf
+++ b/conf/options/starter.conf
@@ -3,9 +3,6 @@ starter {
     # Location of the ipsec.conf file
     # config_file = ${sysconfdir}/ipsec.conf
 
-    # Plugins to load in starter.
-    # load =
-
     # Disable charon plugin load option warning.
     # load_warning = yes
 
diff --git a/conf/options/starter.opt b/conf/options/starter.opt
index 54689e976..f719b1c4b 100644
--- a/conf/options/starter.opt
+++ b/conf/options/starter.opt
@@ -1,8 +1,5 @@
 starter.config_file = ${sysconfdir}/ipsec.conf
 	Location of the ipsec.conf file
 
-starter.load =
-	Plugins to load in starter.
-
 starter.load_warning = yes
 	Disable charon plugin load option warning.