From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 11 Aug 2013 20:14:33 +0000 (+0200)
Subject: rpc: don't check source MAC settings when it is 0
X-Git-Tag: 0.7.7~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5813918ade1bb9121d20d2ae88512cf829c011f1;p=thirdparty%2Flldpd.git

rpc: don't check source MAC settings when it is 0
---

diff --git a/src/daemon/client.c b/src/daemon/client.c
index 0c2c4c0f..bbccf9e6 100644
--- a/src/daemon/client.c
+++ b/src/daemon/client.c
@@ -117,17 +117,19 @@ client_handle_set_configuration(struct lldpd *cfg, enum hmsg_type *type,
 		cfg->g_config.c_set_ifdescr = config->c_set_ifdescr;
 		levent_update_now(cfg);
 	}
-	if (config->c_bond_slave_src_mac_type >
-		LLDP_BOND_SLAVE_SRC_MAC_TYPE_UNKNOWN &&
-		config->c_bond_slave_src_mac_type <=
-		LLDP_BOND_SLAVE_SRC_MAC_TYPE_MAX) {
-		log_debug("rpc", "change bond src mac type to %d",
-				config->c_bond_slave_src_mac_type);
-		cfg->g_config.c_bond_slave_src_mac_type =
-				config->c_bond_slave_src_mac_type;
-	} else {
-		log_info("rpc", "Invalid bond slave src mac type: %d\n",
-				config->c_bond_slave_src_mac_type);
+	if (config->c_bond_slave_src_mac_type != 0) {
+		if (config->c_bond_slave_src_mac_type >
+		    LLDP_BOND_SLAVE_SRC_MAC_TYPE_UNKNOWN &&
+		    config->c_bond_slave_src_mac_type <=
+		    LLDP_BOND_SLAVE_SRC_MAC_TYPE_MAX) {
+			log_debug("rpc", "change bond src mac type to %d",
+			    config->c_bond_slave_src_mac_type);
+			cfg->g_config.c_bond_slave_src_mac_type =
+			    config->c_bond_slave_src_mac_type;
+		} else {
+			log_info("rpc", "Invalid bond slave src mac type: %d\n",
+			    config->c_bond_slave_src_mac_type);
+		}
 	}
 
 	lldpd_config_cleanup(config);