diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-30 16:58:03 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-30 16:58:03 +0200 |
| commit | 293067f086565c294862b954bf58e1680d758280 (patch) | |
| tree | cf5ebe06faba962952846ab2dc682cbdd62dadcd /nhrpd/nhrp_event.c | |
| parent | babeld: The sockaddr code is not passed through anymore (diff) | |
| parent | Merge pull request #617 from donaldsharp/bgp_nexthop (diff) | |
| download | frr-293067f086565c294862b954bf58e1680d758280.tar.xz frr-293067f086565c294862b954bf58e1680d758280.zip | |
Merge remote-tracking branch 'origin/master' into babel
Diffstat (limited to 'nhrpd/nhrp_event.c')
| -rw-r--r-- | nhrpd/nhrp_event.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c index da86c585a..8a3f820f7 100644 --- a/nhrpd/nhrp_event.c +++ b/nhrpd/nhrp_event.c @@ -215,9 +215,12 @@ void evmgr_init(void) void evmgr_set_socket(const char *socket) { - if (nhrp_event_socket_path) + if (nhrp_event_socket_path) { free((char *) nhrp_event_socket_path); - nhrp_event_socket_path = strdup(socket); + nhrp_event_socket_path = NULL; + } + if (socket) + nhrp_event_socket_path = strdup(socket); evmgr_connection_error(&evmgr_connection); } |