diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-04-28 00:38:40 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-04-28 00:38:40 +0000 |
| commit | 4cd1fd0df592abf3f95171c4dbabdaf46789d581 (patch) | |
| tree | 957e729280bedebe662323fab80373b368cd1c35 /usr.sbin/bgpd/parse.y | |
| parent | 6f8c06f8ef514939747639afb8d5cbd5b1b553e6 (diff) | |
prefix the auth related defines by AUTH_, we had a name clash, markus ok
Diffstat (limited to 'usr.sbin/bgpd/parse.y')
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 005851368d2..f70545d1abb 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.92 2004/04/27 23:15:28 markus Exp $ */ +/* $OpenBSD: parse.y,v 1.93 2004/04/28 00:38:39 henning Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -515,7 +515,7 @@ peeropts : REMOTEAS asnumber { free($4); YYERROR; } - curpeer->conf.auth.method = MD5SIG; + curpeer->conf.auth.method = AUTH_MD5SIG; free($4); } | TCP MD5SIG KEY string { @@ -547,11 +547,11 @@ peeropts : REMOTEAS asnumber { curpeer->conf.auth.md5key[i] = strtoul(s, NULL, 16); } - curpeer->conf.auth.method = MD5SIG; + curpeer->conf.auth.method = AUTH_MD5SIG; free($4); } | IPSEC IKE { - curpeer->conf.auth.method = IPSEC_IKE; + curpeer->conf.auth.method = AUTH_IPSEC_IKE; } | IPSEC ESP inout SPI number STRING STRING encspec { unsigned i; @@ -559,7 +559,7 @@ peeropts : REMOTEAS asnumber { u_int32_t auth_alg; u_int8_t keylen; - curpeer->conf.auth.method = IPSEC_MANUAL_ESP; + curpeer->conf.auth.method = AUTH_IPSEC_MANUAL_ESP; if (!strcmp($6, "sha1")) { auth_alg = SADB_AALG_SHA1HMAC; |