denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle comma separated pools as multiple pool names in SQL plugin

Browse Source
This commit is contained in:
Martin Willi
2012-08-30 16:43:43 +02:00
parent b5d2bf975b
commit 7b83cc62e0
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/sql/sql_config.c
+9 -1
View File
@@ -333,6 +333,7 @@ static peer_cfg_t *build_peer_cfg(private_sql_config_t *this, enumerator_t *e,
mediation, mediated_by, p_type; mediation, mediated_by, p_type;
chunk_t l_data, r_data, p_data; chunk_t l_data, r_data, p_data;
char *name, *virtual, *pool; char *name, *virtual, *pool;
enumerator_t *enumerator;
while (e->enumerate(e, while (e->enumerate(e,
&id, &name, &ike_cfg, &l_type, &l_data, &r_type, &r_data, &id, &name, &ike_cfg, &l_type, &l_data, &r_type, &r_data,
@@ -379,7 +380,14 @@ static peer_cfg_t *build_peer_cfg(private_sql_config_t *this, enumerator_t *e,
} }
if (pool) if (pool)
{ {
peer_cfg->add_pool(peer_cfg, pool); /* attr-sql used comma separated pools, but we now completely
* support multiple pools directly. Support old SQL configs: */
enumerator = enumerator_create_token(pool, ",", " ");
while (enumerator->enumerate(enumerator, &pool))
{
peer_cfg->add_pool(peer_cfg, pool);
}
enumerator->destroy(enumerator);
} }
auth = auth_cfg_create(); auth = auth_cfg_create();
auth->add(auth, AUTH_RULE_AUTH_CLASS, auth_method); auth->add(auth, AUTH_RULE_AUTH_CLASS, auth_method);