diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index 0f8d116..4690fe3 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -110,13 +110,14 @@
 static struct interface *
 zebra_interface_if_lookup (struct stream *s)
 {
-  u_char ifname_tmp[INTERFACE_NAMSIZ];
+  char ifname_tmp[INTERFACE_NAMSIZ];
 
   /* Read interface name. */
   stream_get (ifname_tmp, s, INTERFACE_NAMSIZ);
 
   /* And look it up. */
-  return if_lookup_by_name ((char *) ifname_tmp);
+  return if_lookup_by_name_len(ifname_tmp,
+			       strnlen(ifname_tmp, INTERFACE_NAMSIZ));
 }
 
 static int