summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@qadesh.matthew.ath.cx>2009-12-06 00:13:59 +0000
committerMatthew Johnson <mjj29@qadesh.matthew.ath.cx>2009-12-06 00:13:59 +0000
commitc3e889d09ee09c6245ff2cf413aa88fc0a51cf1e (patch)
treedfb6707b823a330b641dcd5269758656f95437eb
parent86fb2958a1ea4a18f4d0b27ea203ef0b1fb8d535 (diff)
update ipmitool
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/passwd_option21
-rw-r--r--debian/patches/series1
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f7e6df1..f106013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ipmitool (1.8.11-2) unstable; urgency=low
+
+ * Fix password reading (Patch from Kris Popendorf
+ <08kcn0b02@sneakemail.com> closes: #559363)
+
+ -- Matthew Johnson <mjj29@debian.org> Sun, 06 Dec 2009 00:05:49 +0000
+
ipmitool (1.8.11-1) unstable; urgency=low
* New upstream release
diff --git a/debian/patches/passwd_option b/debian/patches/passwd_option
new file mode 100644
index 0000000..94c96eb
--- /dev/null
+++ b/debian/patches/passwd_option
@@ -0,0 +1,21 @@
+diff -rupN ipmitool-1.8.11/lib/ipmi_main.c ipmitool-1.8.11.fixed/lib/ipmi_main.c
+--- ipmitool-1.8.11/lib/ipmi_main.c 2009-02-26 05:38:52.000000000 +0900
++++ ipmitool-1.8.11.fixed/lib/ipmi_main.c 2009-12-04 06:50:08.246119798 +0900
+@@ -106,7 +106,7 @@ ipmi_password_file_read(char * filename)
+ char * pass = NULL;
+ int l;
+
+- pass = malloc(16);
++ pass = malloc(21);
+ if (pass == NULL) {
+ lprintf(LOG_ERR, "ipmitool: malloc failure");
+ return NULL;
+@@ -120,7 +120,7 @@ ipmi_password_file_read(char * filename)
+ }
+
+ /* read in id */
+- if (fgets(pass, 16, fp) == NULL) {
++ if (fgets(pass, 21, fp) == NULL) {
+ lprintf(LOG_ERR, "Unable to read password from file %s",
+ filename);
+ fclose(fp);
diff --git a/debian/patches/series b/debian/patches/series
index f9de264..8a6e84e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
99_readme_typo
+passwd_option