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

suppress listing of integrity algorithm if it is undefined

Browse Source
This commit is contained in:
Andreas Steffen
2008-05-17 21:52:58 +00:00
parent 15c508c708
commit a327ee9589
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/sql/sql_attribute.c
+3 -3
View File
@@ -112,7 +112,7 @@ static host_t* get_lease(private_sql_attribute_t *this,
{ {
ip = ip_from_chunk(address); ip = ip_from_chunk(address);
DBG1(DBG_CFG, "reassigning address from valid lease " DBG1(DBG_CFG, "reassigning address from valid lease "
"from pool %s", name); "from pool '%s'", name);
} }
} }
e->destroy(e); e->destroy(e);
@@ -206,12 +206,12 @@ static host_t* create_lease(private_sql_attribute_t *this,
"UPDATE pools SET next = ? WHERE id = ?", "UPDATE pools SET next = ? WHERE id = ?",
DB_BLOB, address, DB_UINT, pool); DB_BLOB, address, DB_UINT, pool);
DBG1(DBG_CFG, "assigning lease with new address " DBG1(DBG_CFG, "assigning lease with new address "
"from pool %s", name); "from pool '%s'", name);
} }
else else
{ {
DBG1(DBG_CFG, "reassigning address from expired lease " DBG1(DBG_CFG, "reassigning address from expired lease "
"from pool %s", name); "from pool '%s'", name);
} }
} }
} }
src/charon/plugins/stroke/stroke_list.c
+10 -4
View File
@@ -125,13 +125,19 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
{ {
fprintf(out, "-%d", encr_len); fprintf(out, "-%d", encr_len);
} }
fprintf(out, "/"); if (int_alg != AUTH_UNDEFINED)
{
fprintf(out, "/");
}
} }
fprintf(out, "%N", integrity_algorithm_names, int_alg); if (int_alg != AUTH_UNDEFINED)
if (int_len)
{ {
fprintf(out, "-%d", int_len); fprintf(out, "%N", integrity_algorithm_names, int_alg);
if (int_len)
{
fprintf(out, "-%d", int_len);
}
} }
fprintf(out, ", rekeying "); fprintf(out, ", rekeying ");