xnu-3248.50.21.tar.gz

[apple/xnu.git] / bsd / netinet / ip_fw2_compat.c

diff --git a/bsd/netinet/ip_fw2_compat.c b/bsd/netinet/ip_fw2_compat.c
index 712f4924102db8e349857f5f9971463375233dcd..c4f1bf576cd0a599274a68661601cdb339db1555 100644 (file)
--- a/bsd/netinet/ip_fw2_compat.c
+++ b/bsd/netinet/ip_fw2_compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -1515,7 +1515,7 @@ ipfw_version_latest_to_one_32(struct ip_fw_32 *curr_rule, struct ip_fw_compat_32
        if (!rule_vers1)
                return;
                
-       bzero(rule_vers1, sizeof(struct ip_fw_compat));
+       bzero(rule_vers1, sizeof(struct ip_fw_compat_32));
        
        rule_vers1->version = IP_FW_VERSION_1;
        rule_vers1->context = CAST_DOWN_EXPLICIT(user32_addr_t,curr_rule->context);
@@ -1541,7 +1541,7 @@ ipfw_version_latest_to_one_64(struct ip_fw_64 *curr_rule, struct ip_fw_compat_64
        if (!rule_vers1)
                return;
                
-       bzero(rule_vers1, sizeof(struct ip_fw_compat));
+       bzero(rule_vers1, sizeof(struct ip_fw_compat_64));
        
        rule_vers1->version = IP_FW_VERSION_1;
        rule_vers1->context = CAST_DOWN_EXPLICIT(__uint64_t, curr_rule->context);
@@ -1981,7 +1981,7 @@ ipfw_convert_to_cmds_32(struct ip_fw *curr_rule, struct ip_fw_compat_32 *compat_
        ipfw_insn       *action, *cmd, *src, *dst;
        ipfw_insn       *have_state = NULL;     /* track check-state or keep-state */
        
-       if (!compat_rule || !curr_rule || !(curr_rule->cmd)) {
+       if (!compat_rule || !curr_rule) {
                return;
        }
 
@@ -2525,7 +2525,7 @@ ipfw_convert_to_cmds_64(struct ip_fw *curr_rule, struct ip_fw_compat_64 *compat_
        ipfw_insn       *action, *cmd, *src, *dst;
        ipfw_insn       *have_state = NULL;     /* track check-state or keep-state */
        
-       if (!compat_rule || !curr_rule || !(curr_rule->cmd)) {
+       if (!compat_rule || !curr_rule) {
                return;
        }