Skip to content

Commit

Permalink
Merged branch 'master' of git://git.tokkee.org/sysdb.
Browse files Browse the repository at this point in the history
  • Loading branch information
tokkee committed Jun 9, 2014
2 parents bd22646 + e0f5057 commit 4cf5f66
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion autogen.sh
@@ -1,7 +1,11 @@
#! /bin/sh

libtoolize=libtoolize
if ! which yacc > /dev/null 2>&1 || ! which lex > /dev/null 2>&1; then
echo "yacc and lex are required to build SysDB" >&2
exit 1
fi

libtoolize=libtoolize
if which glibtoolize > /dev/null 2>&1; then
libtoolize=glibtoolize
fi
Expand Down
8 changes: 4 additions & 4 deletions src/tools/sysdbd/main.c
Expand Up @@ -236,7 +236,7 @@ main_loop(void)

int status = 0;

while (42) {
while (status == 0) {
size_t i;

plugin_main_loop.do_loop = 1;
Expand All @@ -261,10 +261,8 @@ main_loop(void)
}

/* break on error */
if (i < listen_addresses_num) {
status = 1;
if (status)
break;
}

sdb_log(SDB_LOG_INFO, "SysDB daemon "SDB_VERSION_STRING
SDB_VERSION_EXTRA " (libsysdb %s%s, pid %i) initialized "
Expand Down Expand Up @@ -294,6 +292,8 @@ main_loop(void)
}

/* clean up in case we exited the loop on error */
plugin_main_loop.do_loop = 0;
frontend_main_loop.do_loop = 0;
pthread_kill(backend_thread, SIGINT);
pthread_join(backend_thread, NULL);

Expand Down

0 comments on commit 4cf5f66

Please sign in to comment.