diff options
| -rw-r--r-- | src/ipcpd/normal/enroll.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/main.c | 2 | ||||
| -rw-r--r-- | src/irmd/ipcp.c | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c index 7f93ed3a..fc541859 100644 --- a/src/ipcpd/normal/enroll.c +++ b/src/ipcpd/normal/enroll.c @@ -373,6 +373,4 @@ void enroll_stop(void) { if (enroll.state == ENROLL_RUNNING) pthread_cancel(enroll.listener); - - enroll.state = ENROLL_INIT; } diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c index 0a41f883..fa31b9be 100644 --- a/src/ipcpd/normal/main.c +++ b/src/ipcpd/normal/main.c @@ -399,6 +399,8 @@ int main(int argc, stop_components(); } + finalize_components(); + irm_unbind_api(getpid(), ipcpi.name); ipcp_fini(); diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c index ed1ad924..794d060e 100644 --- a/src/irmd/ipcp.c +++ b/src/irmd/ipcp.c @@ -296,14 +296,11 @@ int ipcp_connect(pid_t api, msg.api = api; recv_msg = send_recv_ipcp_msg(api, &msg); - if (recv_msg == NULL) { - log_dbg("bad msg"); + if (recv_msg == NULL) return -EIPCP; - } if (recv_msg->has_result == false) { ipcp_msg__free_unpacked(recv_msg, NULL); - log_dbg("no result."); return -EIPCP; } |