diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2007-10-26 14:10:02 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2007-10-26 14:10:02 +0000 |
| commit | 49104abddf3d71d5abf5cf75dc7f95fa6c55fa63 (patch) | |
| tree | 28f7a72e5dec4abf908fd7874bdab776281310bc /src/starter/cmp.c | |
| parent | 7b0305f59ddab9ea026b202a8c569912e5bf9a90 (diff) | |
| download | vyos-strongswan-49104abddf3d71d5abf5cf75dc7f95fa6c55fa63.tar.gz vyos-strongswan-49104abddf3d71d5abf5cf75dc7f95fa6c55fa63.zip | |
[svn-upgrade] Integrating new upstream version, strongswan (4.1.8)
Diffstat (limited to 'src/starter/cmp.c')
| -rw-r--r-- | src/starter/cmp.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/starter/cmp.c b/src/starter/cmp.c index 9222bf58f..a4198ce41 100644 --- a/src/starter/cmp.c +++ b/src/starter/cmp.c @@ -11,7 +11,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * RCSID $Id: cmp.c,v 1.12 2006/01/13 18:03:25 as Exp $ + * RCSID $Id: cmp.c 3267 2007-10-08 19:57:54Z andreas $ */ #include <string.h> @@ -36,7 +36,14 @@ starter_cmp_end(starter_end_t *c1, starter_end_t *c2) if ((c1 == NULL) || (c2 == NULL)) return FALSE; - ADDCMP(addr); + if (c2->dns_failed) + { + c2->addr = c1->addr; + } + else + { + ADDCMP(addr); + } ADDCMP(nexthop); ADDCMP(srcip); SUBCMP(subnet); |