diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-10-29 11:11:01 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-10-29 11:11:01 +0000 |
| commit | 8b80ab5a6950ce6515f477624794defd7531642a (patch) | |
| tree | aa8303f3806c5615fbeafc4dc82febe3cd7c24dc /src/manager | |
| parent | db67c87db3c9089ea8d2e14f617bf3d9e2af261f (diff) | |
| download | vyos-strongswan-8b80ab5a6950ce6515f477624794defd7531642a.tar.gz vyos-strongswan-8b80ab5a6950ce6515f477624794defd7531642a.zip | |
[svn-upgrade] Integrating new upstream version, strongswan (4.2.8)
Diffstat (limited to 'src/manager')
| -rw-r--r-- | src/manager/Makefile.in | 2 | ||||
| -rw-r--r-- | src/manager/main.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/manager/Makefile.in b/src/manager/Makefile.in index c79dce4d4..900d94b3a 100644 --- a/src/manager/Makefile.in +++ b/src/manager/Makefile.in @@ -212,6 +212,8 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nm_CFLAGS = @nm_CFLAGS@ +nm_LIBS = @nm_LIBS@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ piddir = @piddir@ diff --git a/src/manager/main.c b/src/manager/main.c index 59d534e30..e556a7415 100644 --- a/src/manager/main.c +++ b/src/manager/main.c @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: main.c 3967 2008-05-16 08:52:32Z martin $ + * $Id: main.c 4333 2008-09-04 16:19:46Z andreas $ */ #include <dispatcher.h> @@ -42,7 +42,7 @@ int main (int arc, char *argv[]) socket = lib->settings->get_str(lib->settings, "manager.socket", NULL); debug = lib->settings->get_bool(lib->settings, "manager.debug", FALSE); - timeout = lib->settings->get_int(lib->settings, "manager.timeout", 900); + timeout = lib->settings->get_time(lib->settings, "manager.timeout", 900); threads = lib->settings->get_int(lib->settings, "manager.threads", 10); database = lib->settings->get_str(lib->settings, "manager.database", NULL); if (!database) |