in rtlabel_name2id, handle the case of an empty name: return 0

label id 0 means "no label".
in pf_ioctl, where this is used to filter based on a label, this is an error
condition.
for the other 2 cases, messages on the routing socket, this allows for an
sockaddr_rtlabel to be always present for messages on the routing socket,
and when it is all zero it is exactly like if there was no sockaddr_rtlabel
at all.
ryan ok

1 files changed, 4 insertions, 1 deletions

diff --git a/sys/net/route.c b/sys/net/route.c
index c5f8baa38a4..ccfe02994c0 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.52 2005/06/07 18:21:44 henning Exp $	*/
+/*	$OpenBSD: route.c,v 1.53 2005/06/08 03:13:49 henning Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -1161,6 +1161,9 @@ rtlabel_name2id(char *name)
 	struct rt_label		*label, *p = NULL;
 	u_int16_t		 new_id = 1;
 
+	if (!name[0])
+		return (0);
+
 	TAILQ_FOREACH(label, &rt_labels, rtl_entry)
 		if (strcmp(name, label->rtl_name) == 0) {
 			label->rtl_ref++;