projects / packages / cpqarrayd.git / blame
| Commit | Line | Data |
|---|---|---|
| 2e2e74a8 JR |
1 | --- cpqarrayd-2.3/status.c.orig 2007-12-03 18:06:22.000000000 +0100 |
| 2 | +++ cpqarrayd-2.3/status.c 2018-09-03 10:37:05.375891671 +0200 | |
| 3 | @@ -140,8 +140,7 @@ | |
| 4 | "problem sending snmp trap (sendtrap() returned %d)\n", | |
| 5 | trap_stat); | |
| 6 | if (opts.debug) { | |
| 7 | - printf("DEBUG: Problem sending snmp trap", | |
| 8 | - "(sendtrap() returned %d)\n", | |
| 9 | + printf("DEBUG: Problem sending snmp trap (sendtrap() returned %d)\n", | |
| 10 | trap_stat); | |
| 11 | } | |
| 12 | } | |
| 13 | @@ -167,8 +168,7 @@ | |
| 14 | "problem sending snmp trap (sendtrap() returned %d)\n", | |
| 15 | trap_stat); | |
| 16 | if (opts.debug) { | |
| 17 | - printf("DEBUG: Problem sending snmp trap ", | |
| 18 | - "(sendtrap() returned %d)\n", | |
| 19 | + printf("DEBUG: Problem sending snmp trap (sendtrap() returned %d)\n", | |
| 20 | trap_stat); | |
| 21 | } | |
| 22 | } | |
| 23 | @@ -215,17 +217,16 @@ | |
| 24 | event.detail.logstatchange.logicaldrivenumber, | |
| 25 | logicaldrivestatusstr[event.detail.logstatchange.newlogicaldrivestate]); | |
| 26 | status = event.detail.logstatchange.newlogicaldrivestate; | |
| 27 | - syslog(LOG_WARNING, statusmsg); | |
| 28 | + syslog(LOG_WARNING, "%s", statusmsg); | |
| 29 | if (opts.debug) { | |
| 30 | - printf (statusmsg); | |
| 31 | + puts (statusmsg); | |
| 32 | } | |
| 33 | if (trap_stat = sendtrap(opts, "public", status, statusmsg)) { | |
| 34 | syslog(LOG_WARNING, | |
| 35 | "problem sending snmp trap (sendtrap() returned %d)\n", | |
| 36 | trap_stat); | |
| 37 | if (opts.debug) { | |
| 38 | - printf("DEBUG: Problem sending snmp trap", | |
| 39 | - "(sendtrap() returned %d)\n", | |
| 40 | + printf("DEBUG: Problem sending snmp trap (sendtrap() returned %d)\n", | |
| 41 | trap_stat); | |
| 42 | } | |
| 43 | } | |
| 44 | @@ -234,17 +237,16 @@ | |
| 45 | ctrls_found[ctrl_cntr].devicefile, | |
| 46 | event.mesgstring); | |
| 47 | status = 255; | |
| 48 | - syslog(LOG_WARNING, statusmsg); | |
| 49 | + syslog(LOG_WARNING, "%s", statusmsg); | |
| 50 | if (opts.debug) { | |
| 51 | - printf (statusmsg); | |
| 52 | + puts (statusmsg); | |
| 53 | } | |
| 54 | if (trap_stat = sendtrap(opts, "public", status, statusmsg)) { | |
| 55 | syslog(LOG_WARNING, | |
| 56 | "problem sending snmp trap (sendtrap() returned %d)\n", | |
| 57 | trap_stat); | |
| 58 | if (opts.debug) { | |
| 59 | - printf("DEBUG: Problem sending snmp trap", | |
| 60 | - "(sendtrap() returned %d)\n", | |
| 61 | + printf("DEBUG: Problem sending snmp trap (sendtrap() returned %d)\n", | |
| 62 | trap_stat); | |
| 63 | } | |
| 64 | } |