renamed force_encap to forceencaps (as it is named in openswan)
authorMartin Willi <martin@strongswan.org>
Tue, 2 Oct 2007 06:57:58 +0000 (06:57 -0000)
committerMartin Willi <martin@strongswan.org>
Tue, 2 Oct 2007 06:57:58 +0000 (06:57 -0000)
src/starter/args.c
src/starter/confread.c
src/starter/keywords.h
src/starter/keywords.txt

index 6ddc721..5d69386 100644 (file)
@@ -194,7 +194,7 @@ static const token_info_t token_info[] =
     { ARG_MISC, 0, NULL  /* KW_AUTHBY */                                           },
     { ARG_MISC, 0, NULL  /* KW_EAP */                                              },
     { ARG_MISC, 0, NULL  /* KW_MOBIKE */                                           },
-    { ARG_MISC, 0, NULL  /* KW_FORCE_ENCAP */                                      },
+    { ARG_MISC, 0, NULL  /* KW_FORCEENCAPS */                                      },
     { ARG_TIME, offsetof(starter_conn_t, sa_ike_life_seconds), NULL                },
     { ARG_TIME, offsetof(starter_conn_t, sa_ipsec_life_seconds), NULL              },
     { ARG_TIME, offsetof(starter_conn_t, sa_rekey_margin), NULL                    },
index cd1e213..d1abe71 100644 (file)
@@ -554,7 +554,7 @@ load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg)
                case KW_MOBIKE:
                        KW_POLICY_FLAG("yes", "no", POLICY_MOBIKE)
                        break;
-               case KW_FORCE_ENCAP:
+               case KW_FORCEENCAPS:
                        KW_POLICY_FLAG("yes", "no", POLICY_FORCE_ENCAP)
                        break;
                case KW_MODECONFIG:
index d25e08b..bb0606c 100644 (file)
@@ -71,7 +71,7 @@ typedef enum {
     KW_AUTHBY,
     KW_EAP,
     KW_MOBIKE,
-    KW_FORCE_ENCAP,
+    KW_FORCEENCAPS,
     KW_IKELIFETIME,
     KW_KEYLIFE,
     KW_REKEYMARGIN,
index c0990c5..e4a9bd4 100644 (file)
@@ -50,7 +50,7 @@ virtual_private,   KW_VIRTUAL_PRIVATE
 eap,               KW_EAP
 eapdir,            KW_EAPDIR
 mobike,                   KW_MOBIKE
-force_encap,       KW_FORCE_ENCAP
+forceencaps,       KW_FORCEENCAPS
 pkcs11module,      KW_PKCS11MODULE
 pkcs11initargs,    KW_PKCS11INITARGS
 pkcs11keepstate,   KW_PKCS11KEEPSTATE