From a4031fa3d1eb63c1ff83ba37e5e89d6b1a7d5d04 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Tue, 6 Dec 2016 14:50:52 +0100 Subject: ipcpd: normal: Fix errors on IPCP shutdown This fixes several bad cleanups in the normal IPCP when it is shutting down. --- src/ipcpd/normal/pol/flat.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/ipcpd/normal/pol/flat.c') diff --git a/src/ipcpd/normal/pol/flat.c b/src/ipcpd/normal/pol/flat.c index 06958222..7d489dd5 100644 --- a/src/ipcpd/normal/pol/flat.c +++ b/src/ipcpd/normal/pol/flat.c @@ -163,15 +163,17 @@ int flat_init(void) return -1; } - if (ro_create(name, &rattr, NULL, 0)) { - LOG_ERR("Could not create RO."); - pathname_destroy(name); - pthread_cond_destroy(&flat.cond); - pthread_mutex_destroy(&flat.lock); - ro_unsubscribe(flat.sid); - return -1; + if (!ro_exists(name)) { + rattr.enrol_sync = true; + if (ro_create(name, &rattr, NULL, 0)) { + LOG_ERR("Could not create RO."); + pathname_destroy(name); + pthread_cond_destroy(&flat.cond); + pthread_mutex_destroy(&flat.lock); + ro_unsubscribe(flat.sid); + return -1; + } } - pathname_destroy(name); return 0; -- cgit v1.2.3