diff options
| author | Hung-Weic Chiu <sppsorrg@gmail.com> | 2017-05-03 13:27:29 +0000 |
|---|---|---|
| committer | Hung-Weic Chiu <sppsorrg@gmail.com> | 2017-05-03 13:30:46 +0000 |
| commit | 2a3886acd567bb6c14fcd4467cdbe33fff16a33d (patch) | |
| tree | 0203c63e540c649bb25d244c168e7e782a56874f | |
| parent | 5503498dda776eef74bded6b4818246a997bd786 (diff) | |
Fix the error message when execute ldpd with --enable-tcp-zebra
- If we use the option "--enable-tcp-zebra " to configure, the zclient will use the tcp socket instead of unix domain socket.
- The ldpd will pass the "-z path" options to `frr_opt` and that will execute zclient_serv_path_set to check the domain socket.
- Add the define to ldpd, if the "HAVE_TCP_ZEBRA" has been define, don't pass the "-z path" to `frr_opt`.
Signed-off-by: Hung-Weic Chiu <sppsorrg@gmail.com>
| -rw-r--r-- | ldpd/ldpd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 9729499e28..def3d2e2f3 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -500,8 +500,11 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync, argv[argc++] = (char *)ctl_sock_custom_path; } /* zclient serv path */ +#ifdef HAVE_TCP_ZEBRA +#else argv[argc++] = (char *)"-z"; argv[argc++] = (char *)zclient_serv_path_get(); +#endif /* instance */ if (instance) { argv[argc++] = (char *)"-n"; |
