j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'master' into 1.1

Browse source 
Conflicts:
	doc/tincd.8.in
	lib/pidfile.c
	src/graph.c
	src/net.c
	src/net.h
	src/net_packet.c
	src/net_setup.c
	src/net_socket.c
	src/netutl.c
	src/node.c
	src/node.h
	src/protocol_auth.c
	src/protocol_key.c
	src/tincd.c
This commit is contained in:
Guus Sliepen 2010-11-12 16:15:29 +01:00
commit a22041922f
33 changed files with 294 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/process.c
View file

@ -40,7 +40,9 @@ extern char *identname;
extern char **g_argv;
extern bool use_logfile;
#ifndef HAVE_MINGW
sigset_t emptysigset;
#endif
static void memory_full(int size) {
logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);