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

Merge remote-tracking branch 'dechamps/fsckwin' into 1.1

Browse source
This commit is contained in:
Guus Sliepen 2015-04-12 15:35:37 +02:00
commit 11effab85b
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/fsck.c
View file

@ -155,7 +155,11 @@ static void check_conffile(const char *fname, bool server) {
} }
int fsck(const char *argv0) { int fsck(const char *argv0) {
#ifdef HAVE_MINGW
int uid = 0;
#else
uid_t uid = getuid(); uid_t uid = getuid();
#endif
// Check that tinc.conf is readable. // Check that tinc.conf is readable.

2
src/net_setup.c
View file

@ -667,7 +667,7 @@ static bool add_listen_address(char *address, bool bindto) {
hint.ai_protocol = IPPROTO_TCP; hint.ai_protocol = IPPROTO_TCP;
hint.ai_flags = AI_PASSIVE; hint.ai_flags = AI_PASSIVE;
#ifdef HAVE_DECL_RES_INIT #if HAVE_DECL_RES_INIT
res_init(); res_init();
#endif #endif
int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai); int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);

2
src/netutl.c
View file

@ -39,7 +39,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
hint.ai_family = addressfamily; hint.ai_family = addressfamily;
hint.ai_socktype = socktype; hint.ai_socktype = socktype;
#ifdef HAVE_DECL_RES_INIT #if HAVE_DECL_RES_INIT
res_init(); res_init();
#endif #endif
err = getaddrinfo(address, service, &hint, &ai); err = getaddrinfo(address, service, &hint, &ai);