diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:41:58 +0200 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:41:58 +0200 |
| commit | b590992f735393c97489fce191e7810eaae4f6d7 (patch) | |
| tree | 286595c4aa43dbf3d616d816e5fade6ac364771a /testing/hosts | |
| parent | 2fce29055b7b5bc2860d503d1ae822931f80b7aa (diff) | |
| parent | 0a9d51a49042a68daa15b0c74a2b7f152f52606b (diff) | |
| download | vyos-strongswan-b590992f735393c97489fce191e7810eaae4f6d7.tar.gz vyos-strongswan-b590992f735393c97489fce191e7810eaae4f6d7.zip | |
Merge upstream version 4.5.2
Diffstat (limited to 'testing/hosts')
| -rw-r--r-- | testing/hosts/default/etc/ipsec.d/tables.sql | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/testing/hosts/default/etc/ipsec.d/tables.sql b/testing/hosts/default/etc/ipsec.d/tables.sql index beb87e9d1..2917fc3fc 100644 --- a/testing/hosts/default/etc/ipsec.d/tables.sql +++ b/testing/hosts/default/etc/ipsec.d/tables.sql @@ -18,17 +18,11 @@ CREATE TABLE child_configs ( updown TEXT DEFAULT NULL, hostaccess INTEGER NOT NULL DEFAULT '0', mode INTEGER NOT NULL DEFAULT '2', -<<<<<<< HEAD - dpd_action INTEGER NOT NULL DEFAULT '0', - close_action INTEGER NOT NULL DEFAULT '0', - ipcomp INTEGER NOT NULL DEFAULT '0' -======= start_action INTEGER NOT NULL DEFAULT '0', dpd_action INTEGER NOT NULL DEFAULT '0', close_action INTEGER NOT NULL DEFAULT '0', ipcomp INTEGER NOT NULL DEFAULT '0', reqid INTEGER NOT NULL DEFAULT '0' ->>>>>>> upstream/4.5.1 ); DROP INDEX IF EXISTS child_configs_name; CREATE INDEX child_configs_name ON child_configs ( @@ -46,8 +40,6 @@ CREATE INDEX child_config_traffic_selector_all ON child_config_traffic_selector child_cfg, traffic_selector ); -<<<<<<< HEAD -======= DROP TABLE IF EXISTS proposals; CREATE TABLE proposals ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -61,7 +53,6 @@ CREATE TABLE child_config_proposal ( prop INTEGER NOT NULL ); ->>>>>>> upstream/4.5.1 DROP TABLE IF EXISTS ike_configs; CREATE TABLE ike_configs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -71,8 +62,6 @@ CREATE TABLE ike_configs ( remote TEXT NOT NULL ); -<<<<<<< HEAD -======= DROP TABLE IF EXISTS ike_config_proposal; CREATE TABLE ike_config_proposal ( ike_cfg INTEGER NOT NULL, @@ -80,7 +69,6 @@ CREATE TABLE ike_config_proposal ( prop INTEGER NOT NULL ); ->>>>>>> upstream/4.5.1 DROP TABLE IF EXISTS peer_configs; CREATE TABLE peer_configs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -173,8 +161,6 @@ CREATE TABLE shared_secret_identity ( PRIMARY KEY (shared_secret, identity) ); -<<<<<<< HEAD -======= DROP TABLE IF EXISTS certificate_authorities; CREATE TABLE certificate_authorities ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -189,7 +175,6 @@ CREATE TABLE certificate_distribution_points ( uri TEXT NOT NULL ); ->>>>>>> upstream/4.5.1 DROP TABLE IF EXISTS pools; CREATE TABLE pools ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, |