diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2005-03-05 12:25:13 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2005-03-05 12:25:13 +0000 |
| commit | f4a489e4829bc08d18998f26c74459f3ac1ae07e (patch) | |
| tree | 49919cf5d9cf7868a4556a3dcf6abe652b488236 | |
| parent | eb91f017121b838b41efeb266f8c190b74b5360d (diff) | |
Silence a couple of annoying gcc3 warnings. hshoexer@ ok.
| -rw-r--r-- | sbin/isakmpd/exchange.c | 9 | ||||
| -rw-r--r-- | sbin/isakmpd/message.c | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c index e45340b37d2..c5c720ac372 100644 --- a/sbin/isakmpd/exchange.c +++ b/sbin/isakmpd/exchange.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exchange.c,v 1.109 2005/03/04 13:33:32 markus Exp $ */ +/* $OpenBSD: exchange.c,v 1.110 2005/03/05 12:25:12 ho Exp $ */ /* $EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $ */ /* @@ -190,8 +190,11 @@ exchange_script(struct exchange *exchange) return script_transaction; #endif default: - if (exchange->type >= ISAKMP_EXCH_DOI_MIN && - exchange->type <= ISAKMP_EXCH_DOI_MAX) + if (exchange->type >= ISAKMP_EXCH_DOI_MIN +#if 0 /* always true; silence GCC3 warning */ + && exchange->type <= ISAKMP_EXCH_DOI_MAX +#endif + ) return exchange->doi->exchange_script(exchange->type); } return 0; diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c index 3b3f0074a4a..6fde0bb777b 100644 --- a/sbin/isakmpd/message.c +++ b/sbin/isakmpd/message.c @@ -1,4 +1,4 @@ -/* $OpenBSD: message.c,v 1.96 2005/02/27 13:12:12 hshoexer Exp $ */ +/* $OpenBSD: message.c,v 1.97 2005/03/05 12:25:12 ho Exp $ */ /* $EOM: message.c,v 1.156 2000/10/10 12:36:39 provos Exp $ */ /* @@ -1473,7 +1473,9 @@ message_recv(struct message *msg) * DOI-specific exchange types are definitely wrong. */ if (exch_type >= ISAKMP_EXCH_DOI_MIN +#if 0 /* always true; silence GCC3 warning */ && exch_type <= ISAKMP_EXCH_DOI_MAX +#endif && msg->exchange->doi->validate_exchange(exch_type)) { log_print("message_recv: invalid DOI exchange type %d", exch_type); |