projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #ifdefs that were broken due to commit d178b58.
[tinc]
/
src
/
vde_device.c
diff --git
a/src/vde_device.c
b/src/vde_device.c
index
d97a694
..
6d854a6
100644
(file)
--- a/
src/vde_device.c
+++ b/
src/vde_device.c
@@
-33,7
+33,7
@@
static struct vdepluglib plug;
static struct vdeconn *conn = NULL;
static int port = 0;
static char *group = NULL;
static struct vdeconn *conn = NULL;
static int port = 0;
static char *group = NULL;
-static c
har *device_info
;
+static c
onst char *device_info = "VDE socket"
;
extern char *identname;
extern volatile bool running;
extern char *identname;
extern volatile bool running;
@@
-50,7
+50,7
@@
static bool setup_device(void) {
}
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
}
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
- xasprintf(&device,
LOCALSTATEDIR "/run
/vde.ctl");
+ xasprintf(&device,
RUNSTATEDIR "
/vde.ctl");
}
get_config_string(lookup_config(config_tree, "Interface"), &iface);
}
get_config_string(lookup_config(config_tree, "Interface"), &iface);
@@
-59,8
+59,6
@@
static bool setup_device(void) {
get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
- device_info = "VDE socket";
-
struct vde_open_args args = {
.port = port,
.group = group,
struct vde_open_args args = {
.port = port,
.group = group,