From 8396094156c2ddae279ec9c265100e28acb65a8d Mon Sep 17 00:00:00 2001
From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
Date: Thu, 14 Dec 2017 22:15:01 +0100
Subject: [PATCH 1/2] Minor cleanups

---
 nest/config.Y     | 2 +-
 proto/radv/radv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nest/config.Y b/nest/config.Y
index f51be6ea..358c7745 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -227,7 +227,7 @@ proto_item:
  | IMPORT LIMIT limit_spec { this_proto->in_limit = $3; }
  | EXPORT LIMIT limit_spec { this_proto->out_limit = $3; }
  | IMPORT KEEP FILTERED bool { this_proto->in_keep_filtered = $4; }
- | VRF TEXT { this_proto->vrf = if_get_by_name($2); }
+ | VRF text { this_proto->vrf = if_get_by_name($2); }
  | TABLE rtable { this_proto->table = $2; }
  | ROUTER ID idval { this_proto->router_id = $3; }
  | DESCRIPTION text { this_proto->dsc = $2; }
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index d53b65e3..7e8950c5 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -169,7 +169,7 @@ radv_prepare_prefixes(struct radv_iface *ifa)
   {
     if (pfx->valid && !pfx->mark)
     {
-      RADV_TRACE(D_EVENTS, "Invalidating prefix %I/$d on %s",
+      RADV_TRACE(D_EVENTS, "Invalidating prefix %I/%d on %s",
 		 pfx->prefix, pfx->len, ifa->iface->name);
 
       pfx->valid = 0;

From cce6ba4daa2e00d6e1881a831d05cdc51249b4a7 Mon Sep 17 00:00:00 2001
From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
Date: Tue, 2 Jan 2018 14:11:59 +0100
Subject: [PATCH 2/2] Remove libhistory check

According to GNU Readline developers, if we link with libreadline then
there is no need to link with libhistory at all.
---
 configure.ac | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 91f89edf..d135dc04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,12 +361,6 @@ if test "$enable_client" = yes ; then
     [$TINFO_LIBS]
   )
 
-  AC_SEARCH_LIBS([add_history], [history readline],
-    [HISTORY_LIBS="$LIBS"; LIBS=""],
-    [AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])],
-    [$TINFO_LIBS]
-  )
-
   AC_CHECK_LIB([readline], [rl_crlf],
     [AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()])],
     [],
@@ -380,7 +374,7 @@ if test "$enable_client" = yes ; then
   )
 
   LIBS="$BASE_LIBS"
-  CLIENT_LIBS="$HISTORY_LIBS $READLINE_LIBS $TINFO_LIBS"
+  CLIENT_LIBS="$READLINE_LIBS $TINFO_LIBS"
 fi
 AC_SUBST([CLIENT])
 AC_SUBST([CLIENT_LIBS])