summaryrefslogtreecommitdiff
path: root/src/manager
diff options
context:
space:
mode:
Diffstat (limited to 'src/manager')
-rw-r--r--src/manager/Makefile.in2
-rw-r--r--src/manager/main.c4
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)