diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-07-04 22:23:25 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-07-04 22:23:25 +0000 |
| commit | 19b69d3732fcf70145e097c8969c8e75cfaf180b (patch) | |
| tree | fddd7d87ab98ae5f358c6962569336ffd284510c | |
| parent | ecd04a7a56b1d2c1c164bffa6c41cd08408b8345 (diff) | |
Merge entries.
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index 68bb1eebded..0e1226b1566 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.52 2001/07/01 20:43:39 niklas Exp $ */ +/* $OpenBSD: ipsec.c,v 1.53 2001/07/04 22:23:24 angelos Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -2256,22 +2256,17 @@ ipsec_id_size (char *section, u_int8_t *id) case IPSEC_ID_FQDN: case IPSEC_ID_USER_FQDN: case IPSEC_ID_KEY_ID: - data = conf_get_str (section, "Name"); - if (!data) - { - log_print ("ipsec_id_size: section %s has no \"Name\" tag", section); - return -1; - } - return strlen (data); case IPSEC_ID_DER_ASN1_DN: + case IPSEC_ID_DER_ASN1_GN: data = conf_get_str (section, "Name"); if (!data) { log_print ("ipsec_id_size: section %s has no \"Name\" tag", section); return -1; } - break; + return strlen (data); } - log_print ("ipsec_id_size: unrecognized ID-type %d (%s)", *id, type); + log_print ("ipsec_id_size: unrecognized/unsupported ID-type %d (%s)", + *id, type); return -1; } |