1 files changed, 11 insertions, 0 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 14ef7e6e4a..cc30def303 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -83,6 +83,7 @@ char *vty_cwd = NULL;
 
 /* Configure lock. */
 static int vty_config;
+static int vty_config_is_lockless = 0;
 
 /* Login password check. */
 static int no_password_check = 0;
@@ -2634,6 +2635,8 @@ vty_log_fixed (char *buf, size_t len)
 int
 vty_config_lock (struct vty *vty)
 {
+  if (vty_config_is_lockless)
+    return 1;
   if (vty_config == 0)
     {
       vty->config = 1;
@@ -2645,6 +2648,8 @@ vty_config_lock (struct vty *vty)
 int
 vty_config_unlock (struct vty *vty)
 {
+  if (vty_config_is_lockless)
+    return 0;
   if (vty_config == 1 && vty->config == 1)
     {
       vty->config = 0;
@@ -2653,6 +2658,12 @@ vty_config_unlock (struct vty *vty)
   return vty->config;
 }
 
+void
+vty_config_lockless (void)
+{
+  vty_config_is_lockless = 1;
+}
+
 /* Master of the threads. */
 static struct thread_master *vty_master;