summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2018-09-22 14:14:52 -0400
committerDonald Sharp <sharpd@cumulusnetworks.com>2018-09-22 14:14:52 -0400
commit42a75fec9d9d430bc175bc0ef3fecf81c8888fb5 (patch)
tree963c9a7d0b6fc0514716d1daf6caf3e416ed054d
parent7c12afcf80a4252fe9087dbe14e917f362a23dc4 (diff)
Revert "lib: Ensure FRR detects running of the second instance of a FRR daemon, doesnot allow it to run."
This reverts commit 6e23e5e9e16fb16aafb4ef05ceb3514a02147a21.
-rw-r--r--lib/libfrr.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/lib/libfrr.c b/lib/libfrr.c
index 69e6882617..2bce4766d3 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -262,34 +262,6 @@ bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
static struct frr_daemon_info *di = NULL;
-static void frr_guard_daemon(void)
-{
- int fd;
- struct flock lock;
- const char *path = di->pid_file;
-
- fd = open(path, O_RDWR);
- if (fd != -1) {
- memset(&lock, 0, sizeof(lock));
- lock.l_type = F_WRLCK;
- lock.l_whence = SEEK_SET;
- if (fcntl(fd, F_GETLK, &lock) < 0) {
- 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(
- 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);
- }
- close(fd);
- }
-}
-
void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv)
{
di = daemon;
@@ -619,9 +591,6 @@ struct thread_master *frr_init(void)
zprivs_init(di->privs);
- /* Guard to prevent a second instance of this daemon */
- frr_guard_daemon();
-
master = thread_master_create(NULL);
signal_init(master, di->n_signals, di->signals);