author | henryzh <henry.zhao@oracle.com> |
Mon, 21 Nov 2011 16:45:38 -0800 | |
changeset 589 | beabcdec3918 |
parent 268 | 6518166b581c |
permissions | -rw-r--r-- |
589
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
268
diff
changeset
|
1 |
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved |
beabcdec3918
6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
268
diff
changeset
|
2 |
|
268
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
3 |
--- ipmitool-1.8.10/lib/ipmi_sdr.c.orig Fri Nov 21 13:00:00 2008 |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ ipmitool-1.8.10/lib/ipmi_sdr.c Fri Nov 21 13:01:00 2008 |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -1760,7 +1760,8 @@ |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
6 |
printf("ns | %2d.%1d | ", |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
7 |
sensor->entity.id, |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
8 |
sensor->entity.instance); |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
9 |
- if (IS_SCANNING_DISABLED(rsp->data[1])) |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
10 |
+ if ((rsp != NULL) && |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
11 |
+ IS_SCANNING_DISABLED(rsp->data[1])) |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
12 |
printf("Disabled"); |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
13 |
else |
6518166b581c
7047461 "temporarily" restore sfw version of ipmitool to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
14 |
printf("No Reading"); |