diff options
author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-06-06 14:13:56 +0000 |
---|---|---|
committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-06-06 14:13:56 +0000 |
commit | 2c8167306487b402abee1feffa8bf543fc44b33d (patch) | |
tree | aa6eb893ff5b0f30c91a53c8c127e844d573b713 /packages/ipsec-tools/files/gcc-4.2.patch | |
parent | c2c7d6b185a6b88381eeb4820f8bae76dfd9ac2b (diff) | |
parent | df08ea5a36b5ea679f95da93042a2d3c0cf21bd9 (diff) |
merge of 'a4a93e205d5a389011745cf24cb1a68fbc0ed7e7'
and 'b271566db667a7d227532eeb896b9f11d7e009c9'
Diffstat (limited to 'packages/ipsec-tools/files/gcc-4.2.patch')
-rw-r--r-- | packages/ipsec-tools/files/gcc-4.2.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/packages/ipsec-tools/files/gcc-4.2.patch b/packages/ipsec-tools/files/gcc-4.2.patch new file mode 100644 index 0000000000..573f242e65 --- /dev/null +++ b/packages/ipsec-tools/files/gcc-4.2.patch @@ -0,0 +1,47 @@ +Index: ipsec-tools-0.6.7/src/racoon/var.h +=================================================================== +--- ipsec-tools-0.6.7.orig/src/racoon/var.h 2004-11-21 03:16:59.000000000 +1100 ++++ ipsec-tools-0.6.7/src/racoon/var.h 2007-06-06 12:21:41.000000000 +1000 +@@ -76,9 +76,9 @@ + do { \ + if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), (z), sizeof(z), \ + NIFLAGS) != 0) { \ +- if (y) \ ++ if (y != NULL) \ + strncpy((y), "(invalid)", sizeof(y)); \ +- if (z) \ ++ if (z != NULL) \ + strncpy((z), "(invalid)", sizeof(z)); \ + } \ + } while (0); +@@ -87,7 +87,7 @@ + do { \ + if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \ + NIFLAGS) != 0) { \ +- if (y) \ ++ if (y != NULL) \ + strncpy((y), "(invalid)", sizeof(y)); \ + } \ + } while (0); +Index: ipsec-tools-0.6.7/src/racoon/eaytest.c +=================================================================== +--- ipsec-tools-0.6.7.orig/src/racoon/eaytest.c 2005-06-29 08:38:02.000000000 +1000 ++++ ipsec-tools-0.6.7/src/racoon/eaytest.c 2007-06-06 12:22:59.000000000 +1000 +@@ -311,7 +311,7 @@ + + printf("exact match: succeed.\n"); + +- if (dnstr_w1) { ++ if (dnstr_w1 != NULL) { + asn1dn = eay_str2asn1dn(dnstr_w1, strlen(dnstr_w1)); + if (asn1dn == NULL || asn1dn->l == asn1dn0.l) + errx(1, "asn1dn length wrong for wildcard 1\n"); +@@ -321,7 +321,7 @@ + printf("wildcard 1 match: succeed.\n"); + } + +- if (dnstr_w1) { ++ if (dnstr_w1 != NULL) { + asn1dn = eay_str2asn1dn(dnstr_w2, strlen(dnstr_w2)); + if (asn1dn == NULL || asn1dn->l == asn1dn0.l) + errx(1, "asn1dn length wrong for wildcard 2\n"); |