1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00

Merge commit 'origin/master' into martins

(This used to be ctdb commit 6cbe8923ead8226de1c20cfd8718e43fe8525ce1)
This commit is contained in:
Martin Schwenke 2008-12-10 11:22:59 +11:00
commit 5750e97944

View File

@ -31,6 +31,8 @@
#include "../common/rb_tree.h"
#include "db_wrap.h"
#define ERR_TIMEOUT 20
static void usage(void);
static struct {
@ -2644,7 +2646,7 @@ static void usage(void)
static void ctdb_alarm(int sig)
{
printf("Maximum runtime exceeded - exiting\n");
_exit(0);
_exit(ERR_TIMEOUT);
}
/*