network_cmds-245.8.tar.gz

[apple/network_cmds.git] / racoon.tproj / isakmp_ident.c

diff --git a/racoon.tproj/isakmp_ident.c b/racoon.tproj/isakmp_ident.c
index 6ed424f31c7a443a394b00bf7ba88ff1313d943c..ca55619129ca50d3c357a221d748f9a1bc155ba3 100644 (file)
--- a/racoon.tproj/isakmp_ident.c
+++ b/racoon.tproj/isakmp_ident.c
@@ -1649,17 +1649,10 @@ ident_ir2mx(iph1)
 
 #ifdef IKE_NAT_T
        if (natd_type) {
-               if ((iph1->natt_flags & NATT_TYPE_MASK) == natt_type_apple) {
-                       if (iph1->local_natd)
-                               p = set_isakmp_payload(p, iph1->local_natd, natd_type);
-                       if (iph1->remote_natd)
-                               p = set_isakmp_payload(p, iph1->remote_natd, ISAKMP_NPTYPE_NONE);
-               } else {
-                       if (iph1->remote_natd)
-                               p = set_isakmp_payload(p, iph1->remote_natd, natd_type);
-                       if (iph1->local_natd)
-                               p = set_isakmp_payload(p, iph1->local_natd, ISAKMP_NPTYPE_NONE);
-               }
+               if (iph1->local_natd)
+                       p = set_isakmp_payload(p, iph1->local_natd, natd_type);
+               if (iph1->remote_natd)
+                       p = set_isakmp_payload(p, iph1->remote_natd, ISAKMP_NPTYPE_NONE);
        }
 #endif
        error = 0;