diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2006-07-21 12:34:53 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2006-07-21 12:34:53 +0000 |
| commit | 5c5f5d9ed37fd5eb31caca10e723a3d418b3152e (patch) | |
| tree | eaa1d1eb4e0df0b9e388abe67bbf4d57685855ac | |
| parent | ce4bb9e1757fcdbf87fd91961a6a37baa04d0215 (diff) | |
When no peer is specified, no peer address is defined, thus do not use it.
Noticed by Alexey E. Suslikov <cruel@texnika.com.ua>, thanks!
| -rw-r--r-- | sbin/ipsecctl/ike.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/sbin/ipsecctl/ike.c b/sbin/ipsecctl/ike.c index 9478397946a..8b08170b460 100644 --- a/sbin/ipsecctl/ike.c +++ b/sbin/ipsecctl/ike.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ike.c,v 1.45 2006/06/18 18:18:01 hshoexer Exp $ */ +/* $OpenBSD: ike.c,v 1.46 2006/07/21 12:34:52 hshoexer Exp $ */ /* * Copyright (c) 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> * @@ -90,16 +90,24 @@ ike_section_peer(struct ipsec_addr_wrap *peer, struct ipsec_addr_wrap *local, fprintf(fd, SET "[peer-%s]:Phase=1 force\n", peer->name); fprintf(fd, SET "[peer-%s]:Address=%s force\n", peer->name, peer->name); + if (local) + fprintf(fd, SET "[peer-%s]:Local-address=%s force\n", + peer->name, local->name); + if (auth->type == IKE_AUTH_PSK) + fprintf(fd, SET "[peer-%s]:Authentication=%s force\n", + peer->name, auth->string); } else { fprintf(fd, SET "[Phase 1]:Default=peer-default force\n"); fprintf(fd, SET "[peer-default]:Phase=1 force\n"); + if (local) + fprintf(fd, SET + "[peer-default]:Local-address=%s force\n", + local->name); + if (auth->type == IKE_AUTH_PSK) + fprintf(fd, SET + "[peer-default]:Authentication=%s force\n", + auth->string); } - if (local) - fprintf(fd, SET "[peer-%s]:Local-address=%s force\n", - peer->name, local->name); - if (auth->type == IKE_AUTH_PSK) - fprintf(fd, SET "[peer-%s]:Authentication=%s force\n", - peer->name, auth->string); } static void |