summaryrefslogtreecommitdiff
path: root/usr.sbin/ldpd/parse.y
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/ldpd/parse.y')
-rw-r--r--usr.sbin/ldpd/parse.y14
1 files changed, 2 insertions, 12 deletions
diff --git a/usr.sbin/ldpd/parse.y b/usr.sbin/ldpd/parse.y
index 09bb62beebb..86b70200404 100644
--- a/usr.sbin/ldpd/parse.y
+++ b/usr.sbin/ldpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.3 2010/02/18 15:25:28 michele Exp $ */
+/* $OpenBSD: parse.y,v 1.4 2010/05/25 13:29:45 claudio Exp $ */
/*
* Copyright (c) 2004, 2005, 2008 Esben Norby <norby@openbsd.org>
@@ -107,7 +107,7 @@ typedef struct {
%}
-%token LSPACE INTERFACE ROUTERID LFIBUPDATE RTLABEL
+%token LSPACE INTERFACE ROUTERID LFIBUPDATE
%token HOLDTIME HELLOINTERVAL KEEPALIVE
%token DISTRIBUTION RETENTION ADVERTISEMENT
%token EXTTAG PASSIVE
@@ -212,15 +212,6 @@ conf_main : ROUTERID STRING {
YYERROR;
}
}
- | RTLABEL STRING EXTTAG NUMBER {
- if ($4 < 0 || $4 > UINT_MAX) {
- yyerror("invalid external route tag");
- free($2);
- YYERROR;
- }
- rtlabel_tag(rtlabel_name2id($2), $4);
- free($2);
- }
| defaults
;
defaults : HOLDTIME NUMBER {
@@ -365,7 +356,6 @@ lookup(char *s)
{"passive", PASSIVE},
{"retention", RETENTION},
{"router-id", ROUTERID},
- {"rtlabel", RTLABEL},
{"yes", YES}
};
const struct keywords *p;