recipes/ipsec-tools/files/gcc-4.2.patch

   1 Index: ipsec-tools-0.6.7/src/racoon/var.h
   2 ===================================================================
   3 --- ipsec-tools-0.6.7.orig/src/racoon/var.h     2004-11-21 03:16:59.000000000 +1100
   4 +++ ipsec-tools-0.6.7/src/racoon/var.h  2007-06-06 12:21:41.000000000 +1000
   5 @@ -76,9 +76,9 @@
   6  do { \
   7         if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), (z), sizeof(z), \
   8                         NIFLAGS) != 0) { \
   9 -               if (y) \
  10 +               if (y != NULL) \
  11                         strncpy((y), "(invalid)", sizeof(y)); \
  12 -               if (z) \
  13 +               if (z != NULL) \
  14                         strncpy((z), "(invalid)", sizeof(z)); \
  15         } \
  16  } while (0);
  17 @@ -87,7 +87,7 @@
  18  do { \
  19         if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \
  20                         NIFLAGS) != 0) { \
  21 -               if (y) \
  22 +               if (y != NULL) \
  23                         strncpy((y), "(invalid)", sizeof(y)); \
  24         } \
  25  } while (0);
  26 Index: ipsec-tools-0.6.7/src/racoon/eaytest.c
  27 ===================================================================
  28 --- ipsec-tools-0.6.7.orig/src/racoon/eaytest.c 2005-06-29 08:38:02.000000000 +1000
  29 +++ ipsec-tools-0.6.7/src/racoon/eaytest.c      2007-06-06 12:22:59.000000000 +1000
  30 @@ -311,7 +311,7 @@
  31
  32         printf("exact match: succeed.\n");
  33
  34 -       if (dnstr_w1) {
  35 +       if (dnstr_w1 != NULL) {
  36                 asn1dn = eay_str2asn1dn(dnstr_w1, strlen(dnstr_w1));
  37                 if (asn1dn == NULL || asn1dn->l == asn1dn0.l)
  38                         errx(1, "asn1dn length wrong for wildcard 1\n");
  39 @@ -321,7 +321,7 @@
  40                 printf("wildcard 1 match: succeed.\n");
  41         }
  42
  43 -       if (dnstr_w1) {
  44 +       if (dnstr_w1 != NULL) {
  45                 asn1dn = eay_str2asn1dn(dnstr_w2, strlen(dnstr_w2));
  46                 if (asn1dn == NULL || asn1dn->l == asn1dn0.l)
  47                         errx(1, "asn1dn length wrong for wildcard 2\n");