diff options
Diffstat (limited to 'lib/libfrr.c')
| -rw-r--r-- | lib/libfrr.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/libfrr.c b/lib/libfrr.c index ecdc277572..69e6882617 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -274,12 +274,14 @@ static void frr_guard_daemon(void) lock.l_type = F_WRLCK; lock.l_whence = SEEK_SET; if (fcntl(fd, F_GETLK, &lock) < 0) { - flog_err_sys(LIB_ERR_SYSTEM_CALL, + flog_err_sys( + EC_LIB_SYSTEM_CALL, "Could not do F_GETLK pid_file %s (%s), exiting", path, safe_strerror(errno)); exit(1); } else if (lock.l_type == F_WRLCK) { - flog_err_sys(LIB_ERR_SYSTEM_CALL, + flog_err_sys( + EC_LIB_SYSTEM_CALL, "Process %d has a write lock on file %s already! Error: (%s)", lock.l_pid, path, safe_strerror(errno)); exit(1); @@ -543,15 +545,15 @@ static void frr_mkdir(const char *path, bool strip) if (errno == EEXIST) return; - flog_err(LIB_ERR_SYSTEM_CALL, "failed to mkdir \"%s\": %s", - path, strerror(errno)); + flog_err(EC_LIB_SYSTEM_CALL, "failed to mkdir \"%s\": %s", path, + strerror(errno)); return; } zprivs_get_ids(&ids); if (chown(path, ids.uid_normal, ids.gid_normal)) - flog_err(LIB_ERR_SYSTEM_CALL, "failed to chown \"%s\": %s", - path, strerror(errno)); + flog_err(EC_LIB_SYSTEM_CALL, "failed to chown \"%s\": %s", path, + strerror(errno)); } static struct thread_master *master; @@ -860,7 +862,7 @@ static void frr_terminal_close(int isexit) nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); if (nullfd == -1) { - flog_err_sys(LIB_ERR_SYSTEM_CALL, + flog_err_sys(EC_LIB_SYSTEM_CALL, "%s: failed to open /dev/null: %s", __func__, safe_strerror(errno)); } else { @@ -933,7 +935,7 @@ void frr_run(struct thread_master *master) } else if (di->daemon_mode) { int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); if (nullfd == -1) { - flog_err_sys(LIB_ERR_SYSTEM_CALL, + flog_err_sys(EC_LIB_SYSTEM_CALL, "%s: failed to open /dev/null: %s", __func__, safe_strerror(errno)); } else { |