diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-04-02 01:09:40 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-04-02 01:09:40 +0000 |
| commit | 1e533b1d95c85dc4b529a2f4c3d304cbf0ecf178 (patch) | |
| tree | 5bfa633c221a8a5e73e4c6b5319ae9df66c5d713 /sbin | |
| parent | 27b18cda6bb993520adcc0e6b6d475295e54d225 (diff) | |
Merge with EOM 1.74
1999 copyrights
Better error reporting in lifetime policy checking
too aggressively removing gotos
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/ike_main_mode.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sbin/isakmpd/ike_main_mode.c b/sbin/isakmpd/ike_main_mode.c index d1209969169..0c38315def7 100644 --- a/sbin/isakmpd/ike_main_mode.c +++ b/sbin/isakmpd/ike_main_mode.c @@ -1,8 +1,8 @@ -/* $OpenBSD: ike_main_mode.c,v 1.7 1999/03/31 23:46:52 niklas Exp $ */ -/* $EOM: ike_main_mode.c,v 1.71 1999/03/31 23:33:02 niklas Exp $ */ +/* $OpenBSD: ike_main_mode.c,v 1.8 1999/04/02 01:09:39 niklas Exp $ */ +/* $EOM: ike_main_mode.c,v 1.74 1999/04/02 00:57:44 niklas Exp $ */ /* - * Copyright (c) 1998 Niklas Hallqvist. All rights reserved. + * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1051,8 +1051,11 @@ attribute_unacceptable (u_int16_t type, u_int8_t *value, u_int16_t len, { str = conf_get_str (life->field, "LIFE_TYPE"); if (!str) - /* XXX Log this? */ - continue; + { + log_print ("attribute_unacceptable: " + "section [%s] has no LIFE_TYPE", life->field); + continue; + } /* * If this is the type we are looking at, save a pointer @@ -1062,11 +1065,12 @@ attribute_unacceptable (u_int16_t type, u_int8_t *value, u_int16_t len, { vs->life = life->field; rv = 0; + goto bail_out; } - else - vs->life = 0; } - /* XXX Log? */ + log_print ("attribute_unacceptable: unrecognized LIFE_TYPE %d", + decode_16 (value)); + vs->life = 0; break; case IKE_ATTR_LIFE_DURATION: |