summaryrefslogtreecommitdiff
path: root/zebra/label_manager.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-08-06 07:35:50 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-08-08 11:14:05 +0200
commit689f5a8c84b95dbd31ecab481f8f2977965fe741 (patch)
tree7c2a2b69908b3c3ac60e0de41b5a3f85caec2ef5 /zebra/label_manager.c
parent00857b241e6c27efad54a19b4226c37f04d80bf5 (diff)
*: remove --enable-tcp-zebra, rework ZAPI path
This adds "@tcp" as new choice on the -z option present in zebra and the protocol daemons. The --enable-tcp-zebra option on configure is no longer needed, both UNIX and TCP socket support is always available. Note that @tcp should not be used by default (e.g. in an init script), and --enable-tcp-zebra should never have been in any distro package builds, because **** TCP-ZEBRA IS A SECURITY PROBLEM **** It allows arbitrary local users to mess with the routing table and inject bogus data -- and also ZAPI is not designed to be robust against attacks. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'zebra/label_manager.c')
-rw-r--r--zebra/label_manager.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index b50f751587..1ed5eacd80 100644
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -33,6 +33,7 @@
#include "lib/network.h"
#include "lib/stream.h"
#include "lib/zclient.h"
+#include "lib/libfrr.h"
#include "label_manager.h"
@@ -216,7 +217,8 @@ static int lm_zclient_connect(struct thread *t)
static void lm_zclient_init(char *lm_zserv_path)
{
if (lm_zserv_path)
- zclient_serv_path_set(lm_zserv_path);
+ frr_zclient_addr(&zclient_addr, &zclient_addr_len,
+ lm_zserv_path);
/* Set default values. */
zclient = zclient_new(zebrad.master);