projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for meson build system
[tinc]
/
src
/
names.c
diff --git
a/src/names.c
b/src/names.c
index
6db364e
..
c9318fa
100644
(file)
--- a/
src/names.c
+++ b/
src/names.c
@@
-1,7
+1,7
@@
/*
names.c -- generate commonly used (file)names
Copyright (C) 1998-2005 Ivo Timmermans
/*
names.c -- generate commonly used (file)names
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-201
7
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
8
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-50,6
+50,8
@@
void make_names(bool daemon) {
logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
}
logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
}
+ free(identname);
+
if(netname) {
xasprintf(&identname, "tinc.%s", netname);
} else {
if(netname) {
xasprintf(&identname, "tinc.%s", netname);
} else {
@@
-93,6
+95,7
@@
void make_names(bool daemon) {
}
#ifdef HAVE_MINGW
}
#ifdef HAVE_MINGW
+ (void)daemon;
if(!logfilename) {
xasprintf(&logfilename, "%s" SLASH "log", confbase);
if(!logfilename) {
xasprintf(&logfilename, "%s" SLASH "log", confbase);
@@
-147,7
+150,7
@@
void make_names(bool daemon) {
#endif
if(!unixsocketname) {
#endif
if(!unixsocketname) {
-
in
t len = strlen(pidfilename);
+
size_
t len = strlen(pidfilename);
unixsocketname = xmalloc(len + 8);
memcpy(unixsocketname, pidfilename, len);
unixsocketname = xmalloc(len + 8);
memcpy(unixsocketname, pidfilename, len);