diff options
| author | Martin Willi <martin@strongswan.org> | 2008-05-09 12:22:20 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-05-09 12:22:20 +0000 |
| commit | f3bcd7f04168b6e9da55c6598d1145b6806ede09 (patch) | |
| tree | 6703dd1d1cbd773d2b4d68cb572736642d8a467e /src/charon/plugins/sql/sql_attribute.c | |
| parent | 9f9903a3b36c1da9c4add58a2014647f48cb9c7c (diff) | |
| download | strongswan-f3bcd7f04168b6e9da55c6598d1145b6806ede09.tar.bz2 strongswan-f3bcd7f04168b6e9da55c6598d1145b6806ede09.tar.xz | |
correctly reassigning valid leases
Diffstat (limited to 'src/charon/plugins/sql/sql_attribute.c')
| -rw-r--r-- | src/charon/plugins/sql/sql_attribute.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/charon/plugins/sql/sql_attribute.c b/src/charon/plugins/sql/sql_attribute.c index 2032b420f..717d8fe59 100644 --- a/src/charon/plugins/sql/sql_attribute.c +++ b/src/charon/plugins/sql/sql_attribute.c @@ -96,9 +96,10 @@ static host_t* get_lease(private_sql_attribute_t *this, "JOIN identities AS i ON l.identity = i.id " "WHERE p.name = ? AND i.type = ? AND i.data = ? " "AND (l.release ISNULL OR p.timeout ISNULL " - " OR (l.release < (p.timeout + l.acquire))) " + " OR (l.release >= (? - p.timeout))) " "ORDER BY l.acquire LIMIT 1", DB_TEXT, name, DB_INT, id->get_type(id), DB_BLOB, id->get_encoding(id), + DB_UINT, time(NULL), DB_INT, DB_BLOB); if (e) { |