diff options
| author | Martin Willi <martin@strongswan.org> | 2007-10-02 06:57:58 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2007-10-02 06:57:58 +0000 |
| commit | f9b8417a7c1eeaa408c89fb910b5f329de1d97bd (patch) | |
| tree | 06c54f132d303053f05c14d3606c5672174edf82 | |
| parent | b3d23996eb8ec16d2f20a3bd8ebbeddb7b4c8e53 (diff) | |
| download | strongswan-f9b8417a7c1eeaa408c89fb910b5f329de1d97bd.tar.bz2 strongswan-f9b8417a7c1eeaa408c89fb910b5f329de1d97bd.tar.xz | |
renamed force_encap to forceencaps (as it is named in openswan)
| -rw-r--r-- | src/starter/args.c | 2 | ||||
| -rw-r--r-- | src/starter/confread.c | 2 | ||||
| -rw-r--r-- | src/starter/keywords.h | 2 | ||||
| -rw-r--r-- | src/starter/keywords.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/starter/args.c b/src/starter/args.c index 6ddc7217b..5d69386d7 100644 --- a/src/starter/args.c +++ b/src/starter/args.c @@ -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 }, diff --git a/src/starter/confread.c b/src/starter/confread.c index cd1e21317..d1abe71a0 100644 --- a/src/starter/confread.c +++ b/src/starter/confread.c @@ -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: diff --git a/src/starter/keywords.h b/src/starter/keywords.h index d25e08b47..bb0606c2f 100644 --- a/src/starter/keywords.h +++ b/src/starter/keywords.h @@ -71,7 +71,7 @@ typedef enum { KW_AUTHBY, KW_EAP, KW_MOBIKE, - KW_FORCE_ENCAP, + KW_FORCEENCAPS, KW_IKELIFETIME, KW_KEYLIFE, KW_REKEYMARGIN, diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt index c0990c588..e4a9bd4ab 100644 --- a/src/starter/keywords.txt +++ b/src/starter/keywords.txt @@ -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 |