← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ipmitool/vivid-updates

« back to all changes in this revision

Viewing changes to debian/patches/passwd_option

  • Committer: Package Import Robot
  • Author(s): Luk Claes
  • Date: 2013-05-07 18:12:12 UTC
  • mfrom: (5.1.11 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20130507181212-fitwelheknk3tqnq
Tags: 1.8.12-1
http://bugs.debian.org/692292
Merge new upstream from Ubuntu (Closes: #692292).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/passwd_option
1
 
diff -rupN ipmitool-1.8.11/lib/ipmi_main.c ipmitool-1.8.11.fixed/lib/ipmi_main.c
2
 
--- ipmitool-1.8.11/lib/ipmi_main.c     2009-02-26 05:38:52.000000000 +0900
3
 
+++ ipmitool-1.8.11.fixed/lib/ipmi_main.c       2009-12-04 06:50:08.246119798 +0900
4
 
@@ -106,7 +106,7 @@ ipmi_password_file_read(char * filename)
 
1
--- a/lib/ipmi_main.c
 
2
+++ b/lib/ipmi_main.c
 
3
@@ -108,7 +108,7 @@
5
4
        char * pass = NULL;
6
5
        int l;
7
6
 
10
9
        if (pass == NULL) {
11
10
                lprintf(LOG_ERR, "ipmitool: malloc failure");
12
11
                return NULL;
13
 
@@ -120,7 +120,7 @@ ipmi_password_file_read(char * filename)
 
12
@@ -122,7 +122,7 @@
14
13
        }
15
14
 
16
15
        /* read in id */
17
16
-       if (fgets(pass, 16, fp) == NULL) {
18
17
+       if (fgets(pass, 21, fp) == NULL) {
19
18
                lprintf(LOG_ERR, "Unable to read password from file %s",
20
 
                        filename);
 
19
                                filename);
21
20
                fclose(fp);