From e26c0906b6da8b69ce451ddda695a24b8c606acf Mon Sep 17 00:00:00 2001
From: Matthew Johnson <mjj29@hecate.matthew.ath.cx>
Date: Thu, 13 Dec 2007 10:37:53 +0000
Subject: patches and new version

---
 debian/patches/10_ipmi_lanp.dpatch | 72 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 debian/patches/10_ipmi_lanp.dpatch

(limited to 'debian/patches/10_ipmi_lanp.dpatch')

diff --git a/debian/patches/10_ipmi_lanp.dpatch b/debian/patches/10_ipmi_lanp.dpatch
new file mode 100644
index 0000000..4e7edfd
--- /dev/null
+++ b/debian/patches/10_ipmi_lanp.dpatch
@@ -0,0 +1,72 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_ipmi_lanp.dpatch by  <mjj29@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: 10_ipmi_lanp closes #389741
+
+@DPATCH@
+
+--- ipmitool-1.8.9.orig/lib/ipmi_lanp.c	2007-03-06 22:15:36.000000000 +0000
++++ ipmitool-1.8.9/lib/ipmi_lanp.c	2007-12-13 10:06:18.045813387 +0000
+@@ -1489,28 +1489,43 @@
+ 		}
+ 	}
+ 	/* ip address */
+-	else if ((strncmp(argv[1], "ipaddr", 6) == 0) &&
+-		 (get_cmdline_ipaddr(argv[2], data) == 0)) {
+-		printf("Setting LAN %s to %d.%d.%d.%d\n",
+-		       ipmi_lan_params[IPMI_LANP_IP_ADDR].desc,
+-		       data[0], data[1], data[2], data[3]);
+-		rc = set_lan_param(intf, chan, IPMI_LANP_IP_ADDR, data, 4);
++	else if (strncmp(argv[1], "ipaddr", 6) == 0) {
++		if ( argc < 3 || strncmp(argv[2], "help", 4) == 0 ||
++				get_cmdline_ipaddr(argv[2], data) != 0 ) {
++			lprintf(LOG_NOTICE, "lan set <channel> ipaddr <x.x.x.x>");
++		}
++		else {
++			printf("Setting LAN %s to %d.%d.%d.%d\n",
++					ipmi_lan_params[IPMI_LANP_IP_ADDR].desc,
++					data[0], data[1], data[2], data[3]);
++			rc = set_lan_param(intf, chan, IPMI_LANP_IP_ADDR, data, 4);
++		}
+ 	}
+ 	/* network mask */
+-	else if ((strncmp(argv[1], "netmask", 7) == 0) &&
+-		 (get_cmdline_ipaddr(argv[2], data) == 0)) {
+-		printf("Setting LAN %s to %d.%d.%d.%d\n",
+-		       ipmi_lan_params[IPMI_LANP_SUBNET_MASK].desc,
+-		       data[0], data[1], data[2], data[3]);
+-		rc = set_lan_param(intf, chan, IPMI_LANP_SUBNET_MASK, data, 4);
++	else if (strncmp(argv[1], "netmask", 7) == 0) {
++		if ( argc < 3 || strncmp(argv[2], "help", 4) == 0 ||
++				get_cmdline_ipaddr(argv[2], data) != 0 ) {
++			lprintf(LOG_NOTICE, "lan set <channel> netmask <x.x.x.x>");
++		}
++		else {
++			printf("Setting LAN %s to %d.%d.%d.%d\n",
++					ipmi_lan_params[IPMI_LANP_SUBNET_MASK].desc,
++					data[0], data[1], data[2], data[3]);
++			rc = set_lan_param(intf, chan, IPMI_LANP_SUBNET_MASK, data, 4);
++		}
+ 	}
+ 	/* mac address */
+-	else if ((strncmp(argv[1], "macaddr", 7) == 0) &&
+-		 (get_cmdline_macaddr(argv[2], data) == 0)) {
+-		printf("Setting LAN %s to %02x:%02x:%02x:%02x:%02x:%02x\n",
+-		       ipmi_lan_params[IPMI_LANP_MAC_ADDR].desc,
+-		       data[0], data[1], data[2], data[3], data[4], data[5]);
+-		rc = set_lan_param(intf, chan, IPMI_LANP_MAC_ADDR, data, 6);
++	else if (strncmp(argv[1], "macaddr", 7) == 0) {
++		if ( argc < 3 || strncmp(argv[2], "help", 4) == 0 ||
++				get_cmdline_macaddr(argv[2], data) != 0 ) {
++			lprintf(LOG_NOTICE, "lan set <channel> macaddr <x:x:x:x:x:x>");
++		}
++		else {
++			printf("Setting LAN %s to %02x:%02x:%02x:%02x:%02x:%02x\n",
++					ipmi_lan_params[IPMI_LANP_MAC_ADDR].desc,
++					data[0], data[1], data[2], data[3], data[4], data[5]);
++			rc = set_lan_param(intf, chan, IPMI_LANP_MAC_ADDR, data, 6);
++		}
+ 	}
+ 	/* default gateway settings */
+ 	else if (strncmp(argv[1], "defgw", 5) == 0) {
-- 
cgit v1.2.3