Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
0d64300b2b | ||
|
1208f3dd74 | ||
|
|
51b48118b2 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -7,7 +7,3 @@ ipmitool-1.8.11.tar.bz2
|
|||||||
/ipmitool-1.8.12-130731.tar.bz2
|
/ipmitool-1.8.12-130731.tar.bz2
|
||||||
/ipmitool-1.8.13.tar.bz2
|
/ipmitool-1.8.13.tar.bz2
|
||||||
/ipmitool-1.8.15.tar.bz2
|
/ipmitool-1.8.15.tar.bz2
|
||||||
/ipmitool-1.8.16.tar.bz2
|
|
||||||
/ipmitool-1.8.17.tar.bz2
|
|
||||||
/ipmitool-1.8.18.tar.bz2
|
|
||||||
/ipmitool-1.8.18.tar.gz
|
|
||||||
|
|||||||
@ -1,25 +0,0 @@
|
|||||||
From 152efd46931a70ab4e3d81e99d312df7dcd666e6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Boris Ranto <branto@redhat.com>
|
|
||||||
Date: Tue, 10 May 2016 19:12:08 +0200
|
|
||||||
Subject: [PATCH] CVE-2011-4339 OpenIPMI
|
|
||||||
|
|
||||||
IPMI event daemon creates PID file with world writeable permissions
|
|
||||||
---
|
|
||||||
lib/helper.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lib/helper.c b/lib/helper.c
|
|
||||||
index de91438..c3a1c80 100644
|
|
||||||
--- a/lib/helper.c
|
|
||||||
+++ b/lib/helper.c
|
|
||||||
@@ -829,7 +829,6 @@ ipmi_start_daemon(struct ipmi_intf *intf)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
chdir("/");
|
|
||||||
- umask(0);
|
|
||||||
|
|
||||||
for (fd=0; fd<64; fd++) {
|
|
||||||
if (fd != intf->fd)
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/lanplus_crypt_impl.c
|
|
||||||
--- old/src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200
|
|
||||||
+++ new/src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100
|
|
||||||
@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
|
|
||||||
uint8_t * output,
|
|
||||||
uint32_t * bytes_written)
|
|
||||||
{
|
|
||||||
- EVP_CIPHER_CTX ctx;
|
|
||||||
- EVP_CIPHER_CTX_init(&ctx);
|
|
||||||
- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
|
||||||
- EVP_CIPHER_CTX_set_padding(&ctx, 0);
|
|
||||||
+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
|
|
||||||
+ EVP_CIPHER_CTX_init(ctx);
|
|
||||||
+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
|
||||||
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
|
|
||||||
|
|
||||||
|
|
||||||
*bytes_written = 0;
|
|
||||||
@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
|
|
||||||
assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
|
|
||||||
|
|
||||||
|
|
||||||
- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
|
|
||||||
+ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
|
|
||||||
{
|
|
||||||
/* Error */
|
|
||||||
*bytes_written = 0;
|
|
||||||
@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
|
|
||||||
{
|
|
||||||
uint32_t tmplen;
|
|
||||||
|
|
||||||
- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
|
|
||||||
+ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
|
|
||||||
{
|
|
||||||
*bytes_written = 0;
|
|
||||||
return; /* Error */
|
|
||||||
@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
|
|
||||||
{
|
|
||||||
/* Success */
|
|
||||||
*bytes_written += tmplen;
|
|
||||||
- EVP_CIPHER_CTX_cleanup(&ctx);
|
|
||||||
+ EVP_CIPHER_CTX_cleanup(ctx);
|
|
||||||
+ EVP_CIPHER_CTX_free(ctx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
|
|
||||||
uint8_t * output,
|
|
||||||
uint32_t * bytes_written)
|
|
||||||
{
|
|
||||||
- EVP_CIPHER_CTX ctx;
|
|
||||||
- EVP_CIPHER_CTX_init(&ctx);
|
|
||||||
- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
|
||||||
- EVP_CIPHER_CTX_set_padding(&ctx, 0);
|
|
||||||
+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
|
|
||||||
+ EVP_CIPHER_CTX_init(ctx);
|
|
||||||
+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
|
|
||||||
+ EVP_CIPHER_CTX_set_padding(ctx, 0);
|
|
||||||
|
|
||||||
|
|
||||||
if (verbose >= 5)
|
|
||||||
@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
|
|
||||||
assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
|
|
||||||
|
|
||||||
|
|
||||||
- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
|
|
||||||
+ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
|
|
||||||
{
|
|
||||||
/* Error */
|
|
||||||
lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
|
|
||||||
@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
|
|
||||||
{
|
|
||||||
uint32_t tmplen;
|
|
||||||
|
|
||||||
- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
|
|
||||||
+ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
|
|
||||||
{
|
|
||||||
char buffer[1000];
|
|
||||||
ERR_error_string(ERR_get_error(), buffer);
|
|
||||||
@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
|
|
||||||
{
|
|
||||||
/* Success */
|
|
||||||
*bytes_written += tmplen;
|
|
||||||
- EVP_CIPHER_CTX_cleanup(&ctx);
|
|
||||||
+ EVP_CIPHER_CTX_cleanup(ctx);
|
|
||||||
+ EVP_CIPHER_CTX_free(ctx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,240 +0,0 @@
|
|||||||
diff -urNp old/doc/ipmitool.1 new/doc/ipmitool.1
|
|
||||||
--- old/doc/ipmitool.1 2017-02-06 10:20:02.254362909 +0100
|
|
||||||
+++ new/doc/ipmitool.1 2017-02-06 10:33:41.729294474 +0100
|
|
||||||
@@ -372,6 +372,20 @@ Configure user access information on the
|
|
||||||
|
|
||||||
Displays the list of cipher suites supported for the given
|
|
||||||
application (ipmi or sol) on the given channel.
|
|
||||||
+.TP
|
|
||||||
+\fIsetkg\fP <\fIhex\fP|\fIplain\fP> <\fBkey\fP> [<\fBchannel\fR>]
|
|
||||||
+.br
|
|
||||||
+
|
|
||||||
+Sets K_g key to given value. Use \fIplain\fP to specify \fBkey\fR as simple ASCII string.
|
|
||||||
+Use \fIhex\fP to specify \fBkey\fR as sequence of hexadecimal codes of ASCII charactes.
|
|
||||||
+I.e. following two examples are equivalent:
|
|
||||||
+
|
|
||||||
+.RS
|
|
||||||
+ipmitool channel setkg plain PASSWORD
|
|
||||||
+
|
|
||||||
+ipmitool channel setkg hex 50415353574F5244
|
|
||||||
+.RE
|
|
||||||
+
|
|
||||||
.RE
|
|
||||||
.RE
|
|
||||||
.TP
|
|
||||||
diff -urNp old/include/ipmitool/helper.h new/include/ipmitool/helper.h
|
|
||||||
--- old/include/ipmitool/helper.h 2017-02-06 10:20:02.254362909 +0100
|
|
||||||
+++ new/include/ipmitool/helper.h 2017-02-06 10:40:07.336136844 +0100
|
|
||||||
@@ -58,6 +58,8 @@
|
|
||||||
# define IPMI_UID_MAX 63
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#define IPMI_KG_BUFFER_SIZE 21 /* key plus null byte */
|
|
||||||
+
|
|
||||||
struct ipmi_intf;
|
|
||||||
|
|
||||||
struct valstr {
|
|
||||||
diff -urNp old/include/ipmitool/ipmi_channel.h new/include/ipmitool/ipmi_channel.h
|
|
||||||
--- old/include/ipmitool/ipmi_channel.h 2017-02-06 10:20:02.253316684 +0100
|
|
||||||
+++ new/include/ipmitool/ipmi_channel.h 2017-02-06 10:58:15.291287621 +0100
|
|
||||||
@@ -49,6 +49,10 @@
|
|
||||||
#define IPMI_GET_USER_NAME 0x46
|
|
||||||
#define IPMI_SET_USER_PASSWORD 0x47
|
|
||||||
#define IPMI_GET_CHANNEL_CIPHER_SUITES 0x54
|
|
||||||
+#define IPMI_SET_CHANNEL_SECURITY_KEYS 0x56
|
|
||||||
+
|
|
||||||
+#define IPMI_KG_KEY_ID 1
|
|
||||||
+#define IPMI_SET_CHANNEL_SECURITY_KEYS_OP_SET 1
|
|
||||||
|
|
||||||
/* These are for channel_info_t.session_support */
|
|
||||||
#define IPMI_CHANNEL_SESSION_LESS 0x00
|
|
||||||
@@ -137,6 +141,40 @@ int _ipmi_set_channel_access(struct ipmi
|
|
||||||
struct channel_access_t channel_access, uint8_t access_option,
|
|
||||||
uint8_t privilege_option);
|
|
||||||
|
|
||||||
+struct set_channel_security_keys_req {
|
|
||||||
+#if WORDS_BIGENDIAN
|
|
||||||
+ uint8_t __reserved1 :4;
|
|
||||||
+ uint8_t channel :4;
|
|
||||||
+
|
|
||||||
+ uint8_t __reserved2 :6;
|
|
||||||
+ uint8_t operation :2;
|
|
||||||
+
|
|
||||||
+ uint8_t key_id;
|
|
||||||
+ unsigned char key_value[IPMI_KG_BUFFER_SIZE-1]; /* we don't want space for '\0' at the end */
|
|
||||||
+#else
|
|
||||||
+ uint8_t channel :4;
|
|
||||||
+ uint8_t __reserved1 :4;
|
|
||||||
+
|
|
||||||
+ uint8_t operation :2;
|
|
||||||
+ uint8_t __reserved2 :6;
|
|
||||||
+
|
|
||||||
+ uint8_t key_id;
|
|
||||||
+ unsigned char key_value[IPMI_KG_BUFFER_SIZE-1]; /* we don't want space for '\0' at the end */
|
|
||||||
+#endif
|
|
||||||
+} __attribute__ ((packed));
|
|
||||||
+
|
|
||||||
+struct set_channel_security_keys_rsp {
|
|
||||||
+#if WORDS_BIGENDIAN
|
|
||||||
+ uint8_t __reserved1 :6;
|
|
||||||
+ uint8_t lock_status :2;
|
|
||||||
+ unsigned char key_value; /* just the first character, use &key_value to explore the rest */
|
|
||||||
+#else
|
|
||||||
+ uint8_t lock_status :2;
|
|
||||||
+ uint8_t __reserved1 :6;
|
|
||||||
+ unsigned char key_value; /* just the first character, use &key_value to explore the rest */
|
|
||||||
+#endif
|
|
||||||
+} __attribute__ ((packed));
|
|
||||||
+
|
|
||||||
uint8_t ipmi_get_channel_medium(struct ipmi_intf * intf, uint8_t channel);
|
|
||||||
uint8_t ipmi_current_channel_medium(struct ipmi_intf * intf);
|
|
||||||
int ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv);
|
|
||||||
diff -urNp old/include/ipmitool/ipmi_intf.h new/include/ipmitool/ipmi_intf.h
|
|
||||||
--- old/include/ipmitool/ipmi_intf.h 2017-02-06 10:20:02.254362909 +0100
|
|
||||||
+++ new/include/ipmitool/ipmi_intf.h 2017-02-06 10:40:40.264577602 +0100
|
|
||||||
@@ -60,7 +60,6 @@ enum LANPLUS_SESSION_STATE {
|
|
||||||
|
|
||||||
#define IPMI_AUTHCODE_BUFFER_SIZE 20
|
|
||||||
#define IPMI_SIK_BUFFER_SIZE IPMI_MAX_MD_SIZE
|
|
||||||
-#define IPMI_KG_BUFFER_SIZE 21 /* key plus null byte */
|
|
||||||
|
|
||||||
struct ipmi_session_params {
|
|
||||||
char * hostname;
|
|
||||||
diff -urNp old/lib/ipmi_channel.c new/lib/ipmi_channel.c
|
|
||||||
--- old/lib/ipmi_channel.c 2017-02-06 10:20:02.255409134 +0100
|
|
||||||
+++ new/lib/ipmi_channel.c 2017-02-06 12:32:14.222282317 +0100
|
|
||||||
@@ -821,6 +821,92 @@ ipmi_set_user_access(struct ipmi_intf *i
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+int
|
|
||||||
+ipmi_set_channel_security_keys (struct ipmi_intf *intf, uint8_t channel, const char *method, const char *key)
|
|
||||||
+{
|
|
||||||
+ uint8_t kgkey[IPMI_KG_BUFFER_SIZE];
|
|
||||||
+ struct ipmi_rs *rsp;
|
|
||||||
+ struct ipmi_rq req;
|
|
||||||
+ struct set_channel_security_keys_req req_data;
|
|
||||||
+ int rc = -1;
|
|
||||||
+
|
|
||||||
+ /* convert provided key to array of bytes */
|
|
||||||
+ if (strcmp(method, "hex") == 0) {
|
|
||||||
+ if (strlen(key) > (IPMI_KG_BUFFER_SIZE-1)*2) {
|
|
||||||
+ lprintf(LOG_ERR, "Provided key is too long, max. length is %d bytes", (IPMI_KG_BUFFER_SIZE-1));
|
|
||||||
+ printf_channel_usage();
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ rc = ipmi_parse_hex(key, kgkey, sizeof(kgkey)-1);
|
|
||||||
+ if (rc == -1) {
|
|
||||||
+ lprintf(LOG_ERR, "Number of Kg key characters is not even");
|
|
||||||
+ return rc;
|
|
||||||
+ } else if (rc == -3) {
|
|
||||||
+ lprintf(LOG_ERR, "Kg key is not hexadecimal number");
|
|
||||||
+ return rc;
|
|
||||||
+ } else if (rc > (IPMI_KG_BUFFER_SIZE-1)) {
|
|
||||||
+ lprintf(LOG_ERR, "Kg key is too long");
|
|
||||||
+ return rc;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ } else if (strcmp(method, "plain") == 0) {
|
|
||||||
+ if (strlen(key) > IPMI_KG_BUFFER_SIZE-1) {
|
|
||||||
+ lprintf(LOG_ERR, "Provided key is too long, max. length is %d bytes", (IPMI_KG_BUFFER_SIZE -1));
|
|
||||||
+ printf_channel_usage();
|
|
||||||
+ return rc;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ strncpy(kgkey, key, IPMI_KG_BUFFER_SIZE-1);
|
|
||||||
+ } else {
|
|
||||||
+ printf_channel_usage();
|
|
||||||
+ return rc;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* assemble and send request to set kg key */
|
|
||||||
+ memset(&req_data, 0, sizeof(req_data));
|
|
||||||
+ req_data.channel = channel;
|
|
||||||
+ req_data.operation = IPMI_SET_CHANNEL_SECURITY_KEYS_OP_SET;
|
|
||||||
+ req_data.key_id = IPMI_KG_KEY_ID;
|
|
||||||
+ memcpy(req_data.key_value, kgkey, IPMI_KG_BUFFER_SIZE-1);
|
|
||||||
+
|
|
||||||
+ memset(&req, 0, sizeof(req));
|
|
||||||
+ req.msg.netfn = IPMI_NETFN_APP;
|
|
||||||
+ req.msg.cmd = IPMI_SET_CHANNEL_SECURITY_KEYS;
|
|
||||||
+ req.msg.data = (uint8_t*) &req_data;
|
|
||||||
+ req.msg.data_len = sizeof(req_data);
|
|
||||||
+
|
|
||||||
+ rsp = intf->sendrecv(intf, &req);
|
|
||||||
+ if (rsp == NULL) {
|
|
||||||
+ lprintf(LOG_ERR, "Set Channel Security Keys command failed");
|
|
||||||
+ return rc;
|
|
||||||
+ }
|
|
||||||
+ if (rsp->ccode > 0) {
|
|
||||||
+ const char *error = NULL;
|
|
||||||
+ switch (rsp->ccode) {
|
|
||||||
+ case 0x80:
|
|
||||||
+ error = "Key is locked";
|
|
||||||
+ break;
|
|
||||||
+ case 0x81:
|
|
||||||
+ error = "Insufficient key bytes";
|
|
||||||
+ break;
|
|
||||||
+ case 0x82:
|
|
||||||
+ error = "Too many key bytes";
|
|
||||||
+ break;
|
|
||||||
+ case 0x83:
|
|
||||||
+ error = "Key value does not meet criteria for K_g key";
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ error = val2str(rsp->ccode, completion_code_vals);
|
|
||||||
+ }
|
|
||||||
+ lprintf(LOG_ERR, "Error setting security key: %X (%s)", rsp->ccode, error);
|
|
||||||
+ return rc;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ lprintf(LOG_NOTICE, "Set Channel Security Keys command succeeded");
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
int
|
|
||||||
ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv)
|
|
||||||
{
|
|
||||||
@@ -890,6 +976,19 @@ ipmi_channel_main(struct ipmi_intf *intf
|
|
||||||
retval = ipmi_get_channel_cipher_suites(intf,
|
|
||||||
argv[1], /* ipmi | sol */
|
|
||||||
channel);
|
|
||||||
+ } else if (strncmp(argv[0], "setkg", 5) == 0) {
|
|
||||||
+ if (argc < 3 || argc > 4)
|
|
||||||
+ printf_channel_usage();
|
|
||||||
+ else {
|
|
||||||
+ uint8_t ch = 0xe;
|
|
||||||
+ char *method = argv[1];
|
|
||||||
+ char *key = argv[2];
|
|
||||||
+ if (argc == 4) {
|
|
||||||
+ ch = (uint8_t)strtol(argv[3], NULL, 0);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ retval = ipmi_set_channel_security_keys(intf, ch, method, key);
|
|
||||||
+ }
|
|
||||||
} else {
|
|
||||||
lprintf(LOG_ERR, "Invalid CHANNEL command: %s\n", argv[0]);
|
|
||||||
printf_channel_usage();
|
|
||||||
@@ -916,6 +1015,10 @@ printf_channel_usage()
|
|
||||||
lprintf(LOG_NOTICE,
|
|
||||||
"");
|
|
||||||
lprintf(LOG_NOTICE,
|
|
||||||
+" setkg hex|plain <key> [channel]");
|
|
||||||
+ lprintf(LOG_NOTICE,
|
|
||||||
+"");
|
|
||||||
+ lprintf(LOG_NOTICE,
|
|
||||||
"Possible privilege levels are:");
|
|
||||||
lprintf(LOG_NOTICE,
|
|
||||||
" 1 Callback level");
|
|
||||||
diff -urNp old/src/plugins/ipmi_intf.c new/src/plugins/ipmi_intf.c
|
|
||||||
--- old/src/plugins/ipmi_intf.c 2017-02-06 10:20:02.257501584 +0100
|
|
||||||
+++ new/src/plugins/ipmi_intf.c 2017-02-06 10:42:12.585257810 +0100
|
|
||||||
@@ -55,6 +55,7 @@
|
|
||||||
#include <ipmitool/ipmi.h>
|
|
||||||
#include <ipmitool/ipmi_sdr.h>
|
|
||||||
#include <ipmitool/log.h>
|
|
||||||
+#include <ipmitool/helper.h>
|
|
||||||
|
|
||||||
#define IPMI_DEFAULT_PAYLOAD_SIZE 25
|
|
||||||
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
|
|
||||||
index fa7b082..9bc5ac2 100644
|
|
||||||
--- a/lib/ipmi_sdr.c
|
|
||||||
+++ b/lib/ipmi_sdr.c
|
|
||||||
@@ -572,6 +572,8 @@ ipmi_sdr_get_sensor_reading_ipmb(struct ipmi_intf *intf, uint8_t sensor,
|
|
||||||
uint32_t save_addr;
|
|
||||||
uint32_t save_channel;
|
|
||||||
|
|
||||||
+ if (target == (uint8_t) 0xb1)
|
|
||||||
+ return ipmi_sdr_get_sensor_reading(intf, sensor);
|
|
||||||
if ( BRIDGE_TO_SENSOR(intf, target, channel) ) {
|
|
||||||
lprintf(LOG_DEBUG,
|
|
||||||
"Bridge to Sensor "
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
diff --git a/include/ipmitool/ipmi_sdr.h b/include/ipmitool/ipmi_sdr.h
|
|
||||||
index ccf0cf0..47d3949 100644
|
|
||||||
--- a/include/ipmitool/ipmi_sdr.h
|
|
||||||
+++ b/include/ipmitool/ipmi_sdr.h
|
|
||||||
@@ -819,7 +819,7 @@ static const char *sensor_type_desc[] __attribute__ ((unused)) = {
|
|
||||||
"Version Change", "FRU State" };
|
|
||||||
|
|
||||||
struct sensor_reading {
|
|
||||||
- char s_id[17]; /* name of the sensor */
|
|
||||||
+ char s_id[33]; /* name of the sensor */
|
|
||||||
struct sdr_record_full_sensor *full;
|
|
||||||
struct sdr_record_compact_sensor *compact;
|
|
||||||
uint8_t s_reading_valid; /* read value valididity */
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
diff -urNp old/configure.ac new/configure.ac
|
|
||||||
--- old/configure.ac 2017-02-02 14:20:33.230784269 +0100
|
|
||||||
+++ new/configure.ac 2017-02-02 14:22:53.528510336 +0100
|
|
||||||
@@ -63,7 +63,7 @@ xenable_intf_imb=yes
|
|
||||||
xenable_intf_lipmi=yes
|
|
||||||
xenable_intf_open=yes
|
|
||||||
#xenable_intf_serial=yes
|
|
||||||
-xenable_intf_usb=no
|
|
||||||
+xenable_intf_usb=yes
|
|
||||||
xenable_ipmishell=yes
|
|
||||||
|
|
||||||
dnl set some things so we build with GNU tools on Solaris
|
|
||||||
@@ -209,7 +209,7 @@ fi
|
|
||||||
dnl enable IPMI USB interface
|
|
||||||
AC_ARG_ENABLE([intf-usb],
|
|
||||||
[AC_HELP_STRING([--enable-intf-usb],
|
|
||||||
- [enable IPMI USB interface [default=auto]])],
|
|
||||||
+ [enable IPMI USB interface [default=yes]])],
|
|
||||||
[xenable_intf_usb=$enableval],
|
|
||||||
[xenable_intf_usb=$xenable_intf_usb])
|
|
||||||
if test "x$xenable_intf_usb" = "xstatic" || test "x$xenable_intf_usb" = "xplugin"; then
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
diff -urNp old/doc/ipmitool.1 new/doc/ipmitool.1
|
|
||||||
--- old/doc/ipmitool.1 2017-10-03 16:10:50.446539988 +0200
|
|
||||||
+++ new/doc/ipmitool.1 2017-10-03 16:16:37.039673239 +0200
|
|
||||||
@@ -3170,13 +3170,14 @@ SOL configuration data for the currently
|
|
||||||
|
|
||||||
Enable, disable or show status of SOL payload for the user on the specified channel.
|
|
||||||
.TP
|
|
||||||
-\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>]
|
|
||||||
+\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>] [\fBnoguard\fR]
|
|
||||||
.br
|
|
||||||
|
|
||||||
Configure parameters for Serial Over Lan. If no channel is given,
|
|
||||||
it will display SOL configuration data for the currently used
|
|
||||||
channel. Configuration parameter updates are automatically guarded
|
|
||||||
-with the updates to the set\-in\-progress parameter.
|
|
||||||
+with the updates to the set\-in\-progress parameter, unless \fInoguard\fR
|
|
||||||
+parameter is present.
|
|
||||||
.RS
|
|
||||||
.TP
|
|
||||||
Valid parameters and values are:
|
|
||||||
diff -urNp old/lib/ipmi_sol.c new/lib/ipmi_sol.c
|
|
||||||
--- old/lib/ipmi_sol.c 2017-10-03 16:10:50.447539996 +0200
|
|
||||||
+++ new/lib/ipmi_sol.c 2017-10-03 16:18:37.079006949 +0200
|
|
||||||
@@ -1875,7 +1875,7 @@ static void
|
|
||||||
print_sol_usage(void)
|
|
||||||
{
|
|
||||||
lprintf(LOG_NOTICE, "SOL Commands: info [<channel number>]");
|
|
||||||
- lprintf(LOG_NOTICE, " set <parameter> <value> [channel]");
|
|
||||||
+ lprintf(LOG_NOTICE, " set <parameter> <value> [channel] [noguard]");
|
|
||||||
lprintf(LOG_NOTICE, " payload <enable|disable|status> [channel] [userid]");
|
|
||||||
lprintf(LOG_NOTICE, " activate [<usesolkeepalive|nokeepalive>] [instance=<number>]");
|
|
||||||
lprintf(LOG_NOTICE, " deactivate [instance=<number>]");
|
|
||||||
@@ -1890,6 +1890,8 @@ print_sol_usage(void)
|
|
||||||
static void
|
|
||||||
print_sol_set_usage(void)
|
|
||||||
{
|
|
||||||
+ lprintf(LOG_NOTICE, "\nSOL set usage: \n");
|
|
||||||
+ lprintf(LOG_NOTICE, " sol set <parameter> <value> [channel] [noguard]\n");
|
|
||||||
lprintf(LOG_NOTICE, "\nSOL set parameters and values: \n");
|
|
||||||
lprintf(LOG_NOTICE, " set-in-progress set-complete | "
|
|
||||||
"set-in-progress | commit-write");
|
|
||||||
39
ipmitool-1.8.10-ipmievd-condrestart.patch
Normal file
39
ipmitool-1.8.10-ipmievd-condrestart.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
532188 - ipmievd init script's condrestart doesn't work
|
||||||
|
|
||||||
|
Author: Ville Skyttä (ville.skytta@iki.fi)
|
||||||
|
Sent upstream as https://sourceforge.net/tracker/?func=detail&aid=2889888&group_id=95200&atid=610552
|
||||||
|
|
||||||
|
Index: contrib/ipmievd.init.redhat
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cvsroot/ipmitool/ipmitool/contrib/ipmievd.init.redhat,v
|
||||||
|
retrieving revision 1.1
|
||||||
|
diff -u -r1.1 ipmievd.init.redhat
|
||||||
|
--- contrib/ipmievd.init.redhat 19 Mar 2006 23:05:48 -0000 1.1
|
||||||
|
+++ contrib/ipmievd.init.redhat 31 Oct 2009 08:50:07 -0000
|
||||||
|
@@ -62,6 +62,11 @@
|
||||||
|
return $ret
|
||||||
|
}
|
||||||
|
|
||||||
|
+restart() {
|
||||||
|
+ stop
|
||||||
|
+ start
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
start
|
||||||
|
@@ -72,11 +77,10 @@
|
||||||
|
status)
|
||||||
|
status $IPMIEVD_BIN
|
||||||
|
;;
|
||||||
|
- restart|reload)
|
||||||
|
- stop
|
||||||
|
- start
|
||||||
|
+ restart|reload|force-reload)
|
||||||
|
+ restart
|
||||||
|
;;
|
||||||
|
- condrestart)
|
||||||
|
+ try-restart|condrestart)
|
||||||
|
[ -f /var/lock/subsys/ipmievd ] && restart || :
|
||||||
|
;;
|
||||||
|
*)
|
||||||
32
ipmitool-1.8.10-ipmievd-init.patch
Normal file
32
ipmitool-1.8.10-ipmievd-init.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
diff -up ipmitool-1.8.10/contrib/ipmievd.init.redhat.ipmievd-init ipmitool-1.8.10/contrib/ipmievd.init.redhat
|
||||||
|
--- ipmitool-1.8.10/contrib/ipmievd.init.redhat.ipmievd-init 2006-03-20 00:05:48.000000000 +0100
|
||||||
|
+++ ipmitool-1.8.10/contrib/ipmievd.init.redhat 2008-10-14 13:46:35.000000000 +0200
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
# Based on example sysvinitfiles script
|
||||||
|
# Copyright (c) 2000 Red Hat Software, Inc.
|
||||||
|
#
|
||||||
|
-# chkconfig: 345 99 00
|
||||||
|
+# chkconfig: - 99 00
|
||||||
|
# description: ipmievd daemon to send events to syslog
|
||||||
|
# processname: ipmievd
|
||||||
|
# config: /etc/sysconfig/ipmievd
|
||||||
|
@@ -16,8 +16,8 @@
|
||||||
|
# Should-Start: $time
|
||||||
|
# Required-Stop: $syslog ipmi
|
||||||
|
# Should-Stop: $time
|
||||||
|
-# Default-Start: 3 4 5
|
||||||
|
-# Default-Stop: 0 1 2 6
|
||||||
|
+# Default-Start:
|
||||||
|
+# Default-Stop:
|
||||||
|
# Short-Description: ipmievd daemon to send events to syslog
|
||||||
|
# Description: Start ipmievd to read events from BMC and
|
||||||
|
# log them to syslog. Events correspond to hardware faults,
|
||||||
|
@@ -85,7 +85,7 @@ case "$1" in
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: ipmievd {start|stop|status|reload|restart|condrestart}"
|
||||||
|
- exit 1
|
||||||
|
+ exit 2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
exit $?
|
||||||
13
ipmitool-1.8.11-remove-umask0.patch
Normal file
13
ipmitool-1.8.11-remove-umask0.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
CVE-2011-4339 OpenIPMI: IPMI event daemon creates PID file with world writeable permissions
|
||||||
|
|
||||||
|
diff -up ipmitool-1.8.11/lib/helper.c.original ipmitool-1.8.11/lib/helper.c
|
||||||
|
--- ipmitool-1.8.11/lib/helper.c.original 2011-10-03 13:00:54.000000000 +0900
|
||||||
|
+++ ipmitool-1.8.11/lib/helper.c 2011-10-03 13:01:01.000000000 +0900
|
||||||
|
@@ -427,7 +427,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
|
||||||
|
#endif
|
||||||
|
|
||||||
|
chdir("/");
|
||||||
|
- umask(0);
|
||||||
|
|
||||||
|
for (fd=0; fd<64; fd++) {
|
||||||
|
if (fd != intf->fd)
|
||||||
174
ipmitool-1.8.12-fips.patch
Normal file
174
ipmitool-1.8.12-fips.patch
Normal file
@ -0,0 +1,174 @@
|
|||||||
|
diff -up ./src/plugins/lan/lan.c.fips ./src/plugins/lan/lan.c
|
||||||
|
--- ./src/plugins/lan/lan.c.fips 2013-08-09 13:49:30.014768330 +0200
|
||||||
|
+++ ./src/plugins/lan/lan.c 2013-08-09 13:55:02.425532024 +0200
|
||||||
|
@@ -67,6 +67,10 @@
|
||||||
|
#define IPMI_LAN_PORT 0x26f
|
||||||
|
#define IPMI_LAN_CHANNEL_E 0x0e
|
||||||
|
|
||||||
|
+#if defined(HAVE_CRYPTO_MD2) || defined(HAVE_CRYPTO_MD5)
|
||||||
|
+#include <openssl/fips.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
extern const struct valstr ipmi_privlvl_vals[];
|
||||||
|
extern const struct valstr ipmi_authtype_session_vals[];
|
||||||
|
extern int verbose;
|
||||||
|
@@ -861,10 +865,22 @@ ipmi_lan_build_cmd(struct ipmi_intf * in
|
||||||
|
*/
|
||||||
|
switch (s->authtype) {
|
||||||
|
case IPMI_SESSION_AUTHTYPE_MD5:
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -I lanplus\n");
|
||||||
|
+ }
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
temp = ipmi_auth_md5(s, msg+mp, msg[mp-1]);
|
||||||
|
memcpy(msg+ap, temp, 16);
|
||||||
|
break;
|
||||||
|
case IPMI_SESSION_AUTHTYPE_MD2:
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD2 not supported in FIPS mode. Try -I lanplus\n");
|
||||||
|
+ }
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
temp = ipmi_auth_md2(s, msg+mp, msg[mp-1]);
|
||||||
|
memcpy(msg+ap, temp, 16);
|
||||||
|
break;
|
||||||
|
diff -up ./src/plugins/lanplus/lanplus.c.fips ./src/plugins/lanplus/lanplus.c
|
||||||
|
--- ./src/plugins/lanplus/lanplus.c.fips 2013-07-16 06:17:39.000000000 +0200
|
||||||
|
+++ ./src/plugins/lanplus/lanplus.c 2013-08-09 13:54:27.720451992 +0200
|
||||||
|
@@ -65,6 +65,10 @@
|
||||||
|
#include "rmcp.h"
|
||||||
|
#include "asf.h"
|
||||||
|
|
||||||
|
+#if defined(HAVE_CRYPTO_MD2) || defined(HAVE_CRYPTO_MD5)
|
||||||
|
+#include <openssl/fips.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
extern const struct valstr ipmi_rakp_return_codes[];
|
||||||
|
extern const struct valstr ipmi_priv_levels[];
|
||||||
|
extern const struct valstr ipmi_auth_algorithms[];
|
||||||
|
@@ -183,56 +187,122 @@ int lanplus_get_requested_ciphers(int
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_SHA1;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
|
||||||
|
*crypt_alg = IPMI_CRYPT_XRC4_128;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("RC4 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_SHA1;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
|
||||||
|
*crypt_alg = IPMI_CRYPT_XRC4_40;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("RC4 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 6:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_NONE;
|
||||||
|
*crypt_alg = IPMI_CRYPT_NONE;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 1\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 7:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
|
||||||
|
*crypt_alg = IPMI_CRYPT_NONE;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 2\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 8:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
|
||||||
|
*crypt_alg = IPMI_CRYPT_AES_CBC_128;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 9:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
|
||||||
|
*crypt_alg = IPMI_CRYPT_XRC4_128;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 10:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
|
||||||
|
*crypt_alg = IPMI_CRYPT_XRC4_40;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 11:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_MD5_128;
|
||||||
|
*crypt_alg = IPMI_CRYPT_NONE;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 12:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_MD5_128;
|
||||||
|
*crypt_alg = IPMI_CRYPT_AES_CBC_128;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 13:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_MD5_128;
|
||||||
|
*crypt_alg = IPMI_CRYPT_XRC4_128;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
case 14:
|
||||||
|
*auth_alg = IPMI_AUTH_RAKP_HMAC_MD5;
|
||||||
|
*integrity_alg = IPMI_INTEGRITY_MD5_128;
|
||||||
|
*crypt_alg = IPMI_CRYPT_XRC4_40;
|
||||||
|
+ if (FIPS_mode()) {
|
||||||
|
+ if (verbose > 1) {
|
||||||
|
+ printf("MD5 not supported in FIPS mode. Try -C 3\n");
|
||||||
|
+ }
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
19
ipmitool-1.8.12-fipsman.patch
Normal file
19
ipmitool-1.8.12-fipsman.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
diff -up ./doc/ipmitool.1.fipsman ./doc/ipmitool.1
|
||||||
|
--- ./doc/ipmitool.1.fipsman 2013-08-09 13:13:27.005088284 +0200
|
||||||
|
+++ ./doc/ipmitool.1 2013-08-09 13:23:07.975337252 +0200
|
||||||
|
@@ -98,6 +98,7 @@ The remote server authentication, integr
|
||||||
|
to use for IPMIv2.0 \fIlanplus\fP connections. See table 22\-19 in the
|
||||||
|
IPMIv2.0 specification. The default is 3 which specifies RAKP\-HMAC\-SHA1
|
||||||
|
authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 encryption algorithms.
|
||||||
|
+In FIPS mode the 0-3 are available.
|
||||||
|
.TP
|
||||||
|
\fB\-d \fIN\fP\fR
|
||||||
|
Use device number N to specify the /dev/ipmiN (or
|
||||||
|
@@ -132,6 +133,7 @@ option is required for \fIlan\fP and \fI
|
||||||
|
\fB\-I\fR <\fIinterface\fP>
|
||||||
|
Selects IPMI interface to use. Supported interfaces that are
|
||||||
|
compiled in are visible in the usage help output.
|
||||||
|
+In FIPS mode the lan interface is not available due to implemented authentication.
|
||||||
|
.TP
|
||||||
|
\fB\-k\fR <\fIkey\fP>
|
||||||
|
Use supplied Kg key for IPMIv2.0 authentication. The default is not to
|
||||||
86
ipmitool-1.8.12f-passarg.patch
Normal file
86
ipmitool-1.8.12f-passarg.patch
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
diff -up ./lib/ipmi_main.c.passarg ./lib/ipmi_main.c
|
||||||
|
--- ./lib/ipmi_main.c.passarg 2012-12-13 16:47:34.585182645 +0100
|
||||||
|
+++ ./lib/ipmi_main.c 2012-12-13 16:57:12.023739444 +0100
|
||||||
|
@@ -403,6 +403,7 @@ ipmi_main(int argc, char ** argv,
|
||||||
|
int argflag, i, found;
|
||||||
|
int rc = -1;
|
||||||
|
char sol_escape_char = SOL_ESCAPE_CHARACTER_DEFAULT;
|
||||||
|
+ int querrypass = 0;
|
||||||
|
|
||||||
|
/* save program name */
|
||||||
|
progname = strrchr(argv[0], '/');
|
||||||
|
@@ -501,6 +502,7 @@ ipmi_main(int argc, char ** argv,
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'f':
|
||||||
|
+ querrypass = 0;
|
||||||
|
if (password)
|
||||||
|
free(password);
|
||||||
|
password = ipmi_password_file_read(optarg);
|
||||||
|
@@ -509,22 +511,7 @@ ipmi_main(int argc, char ** argv,
|
||||||
|
"from file %s", optarg);
|
||||||
|
break;
|
||||||
|
case 'a':
|
||||||
|
- if (tmp)
|
||||||
|
- free(tmp);
|
||||||
|
-#ifdef HAVE_GETPASSPHRASE
|
||||||
|
- tmp = getpassphrase("Password: ");
|
||||||
|
-#else
|
||||||
|
- tmp = getpass("Password: ");
|
||||||
|
-#endif
|
||||||
|
- if (tmp != NULL) {
|
||||||
|
- if (password)
|
||||||
|
- free(password);
|
||||||
|
- password = strdup(tmp);
|
||||||
|
- if (password == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
+ querrypass = 1;
|
||||||
|
break;
|
||||||
|
case 'k':
|
||||||
|
if (kgkey)
|
||||||
|
@@ -623,6 +610,7 @@ ipmi_main(int argc, char ** argv,
|
||||||
|
oemtype = strdup("supermicro");
|
||||||
|
break;
|
||||||
|
case 'P':
|
||||||
|
+ querrypass = 0;
|
||||||
|
if (password)
|
||||||
|
free(password);
|
||||||
|
password = strdup(optarg);
|
||||||
|
@@ -636,6 +624,7 @@ ipmi_main(int argc, char ** argv,
|
||||||
|
memset(optarg, 'X', i);
|
||||||
|
break;
|
||||||
|
case 'E':
|
||||||
|
+ querrypass = 0;
|
||||||
|
if ((tmpe = getenv("IPMITOOL_PASSWORD"))) {
|
||||||
|
if (password)
|
||||||
|
free(password);
|
||||||
|
@@ -755,6 +744,26 @@ ipmi_main(int argc, char ** argv,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* ask for password once and only if going to use it */
|
||||||
|
+ if (querrypass) {
|
||||||
|
+ if (tmp)
|
||||||
|
+ free(tmp);
|
||||||
|
+#ifdef HAVE_GETPASSPHRASE
|
||||||
|
+ tmp = getpassphrase("Password: ");
|
||||||
|
+#else
|
||||||
|
+ tmp = getpass("Password: ");
|
||||||
|
+#endif
|
||||||
|
+ if (tmp != NULL) {
|
||||||
|
+ if (password)
|
||||||
|
+ free(password);
|
||||||
|
+ password = strdup(tmp);
|
||||||
|
+ if (password == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* check for command before doing anything */
|
||||||
|
if (argc-optind > 0 &&
|
||||||
|
strncmp(argv[optind], "help", 4) == 0) {
|
||||||
13
ipmitool-1.8.13-dualbridgedoc.patch
Normal file
13
ipmitool-1.8.13-dualbridgedoc.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -up ipmitool-1.8.13/doc/ipmitool.1.dualbridge ipmitool-1.8.13/doc/ipmitool.1
|
||||||
|
--- ipmitool-1.8.13/doc/ipmitool.1.dualbridge 2013-11-05 10:10:20.139940133 +0100
|
||||||
|
+++ ipmitool-1.8.13/doc/ipmitool.1 2013-11-05 10:10:35.197947425 +0100
|
||||||
|
@@ -156,9 +156,6 @@ Set the local IPMB address. The local a
|
||||||
|
or is auto discovered on PICMG platforms when -m is not specified.
|
||||||
|
There should be no need to change the local address for normal operation.
|
||||||
|
.TP
|
||||||
|
-\fB\-M\fR <\fIaddress\fP>
|
||||||
|
-Set transit local address for bridge request. (dual bridge)
|
||||||
|
-.TP
|
||||||
|
\fB\-N\fR <\fIsec\fP>
|
||||||
|
Specify nr. of seconds between retransmissions of lan/lanplus messages.
|
||||||
|
Defaults are 2 seconds for lan and 1 second for lanplus interfaces.
|
||||||
795
ipmitool-1.8.13-envarg.patch
Normal file
795
ipmitool-1.8.13-envarg.patch
Normal file
@ -0,0 +1,795 @@
|
|||||||
|
diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c
|
||||||
|
index 1885bb5..0e420f6 100644
|
||||||
|
--- a/lib/ipmi_main.c
|
||||||
|
+++ b/lib/ipmi_main.c
|
||||||
|
@@ -388,401 +388,444 @@ ipmi_main(int argc, char ** argv,
|
||||||
|
char sol_escape_char = SOL_ESCAPE_CHARACTER_DEFAULT;
|
||||||
|
char * devfile = NULL;
|
||||||
|
|
||||||
|
+ int cnt = argc;
|
||||||
|
+ char **arg = argv;
|
||||||
|
+ int voptind;
|
||||||
|
+ int argecnt = 0;
|
||||||
|
+ char **arge = NULL;
|
||||||
|
+ char **narge = NULL;
|
||||||
|
+ char *argestr = NULL;
|
||||||
|
+
|
||||||
|
/* save program name */
|
||||||
|
progname = strrchr(argv[0], '/');
|
||||||
|
progname = ((progname == NULL) ? argv[0] : progname+1);
|
||||||
|
signal(SIGINT, ipmi_catch_sigint);
|
||||||
|
|
||||||
|
- while ((argflag = getopt(argc, (char **)argv, OPTION_STRING)) != -1)
|
||||||
|
+ do
|
||||||
|
{
|
||||||
|
- switch (argflag) {
|
||||||
|
- case 'I':
|
||||||
|
- if (intfname) {
|
||||||
|
- free(intfname);
|
||||||
|
- intfname = NULL;
|
||||||
|
- }
|
||||||
|
- intfname = strdup(optarg);
|
||||||
|
- if (intfname == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- if (intflist != NULL) {
|
||||||
|
- found = 0;
|
||||||
|
- for (sup=intflist; sup->name != NULL; sup++) {
|
||||||
|
- if (strncmp(sup->name, intfname, strlen(intfname)) == 0 &&
|
||||||
|
- strncmp(sup->name, intfname, strlen(sup->name)) == 0 &&
|
||||||
|
- sup->supported == 1)
|
||||||
|
- found = 1;
|
||||||
|
+ if (arge != NULL) {
|
||||||
|
+ voptind = optind;
|
||||||
|
+ cnt = argecnt;
|
||||||
|
+ arg = arge;
|
||||||
|
+ }
|
||||||
|
+ while ((argflag = getopt(cnt, (char **)arg, OPTION_STRING)) != -1)
|
||||||
|
+ {
|
||||||
|
+ switch (argflag) {
|
||||||
|
+ case 'I':
|
||||||
|
+ if (intfname) {
|
||||||
|
+ free(intfname);
|
||||||
|
+ intfname = NULL;
|
||||||
|
}
|
||||||
|
- if (!found) {
|
||||||
|
- lprintf(LOG_ERR, "Interface %s not supported", intfname);
|
||||||
|
+ intfname = strdup(optarg);
|
||||||
|
+ if (intfname == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
goto out_free;
|
||||||
|
}
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'h':
|
||||||
|
- ipmi_option_usage(progname, cmdlist, intflist);
|
||||||
|
- rc = 0;
|
||||||
|
- goto out_free;
|
||||||
|
- break;
|
||||||
|
- case 'V':
|
||||||
|
- printf("%s version %s\n", progname, VERSION);
|
||||||
|
- rc = 0;
|
||||||
|
- goto out_free;
|
||||||
|
- break;
|
||||||
|
- case 'd':
|
||||||
|
- if (str2int(optarg, &devnum) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-d'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- /* Check if device number is -gt 0; I couldn't find limit for
|
||||||
|
- * kernels > 2.6, thus right side is unlimited.
|
||||||
|
- */
|
||||||
|
- if (devnum < 0) {
|
||||||
|
- lprintf(LOG_ERR, "Device number %i is out of range.", devnum);
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'p':
|
||||||
|
- if (str2int(optarg, &port) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-p'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- /* Check if port is -gt 0 && port is -lt 65535 */
|
||||||
|
- if (port < 0 || port > 65535) {
|
||||||
|
- lprintf(LOG_ERR, "Port number %i is out of range.", port);
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'C':
|
||||||
|
- if (str2int(optarg, &cipher_suite_id) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-C'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- /* add check Cipher is -gt 0 */
|
||||||
|
- if (cipher_suite_id < 0) {
|
||||||
|
- lprintf(LOG_ERR, "Cipher suite ID %i is invalid.", cipher_suite_id);
|
||||||
|
- rc = -1;
|
||||||
|
+ if (intflist != NULL) {
|
||||||
|
+ found = 0;
|
||||||
|
+ for (sup=intflist; sup->name != NULL; sup++) {
|
||||||
|
+ if (strncmp(sup->name, intfname, strlen(intfname)) == 0 &&
|
||||||
|
+ strncmp(sup->name, intfname, strlen(sup->name)) == 0 &&
|
||||||
|
+ sup->supported == 1)
|
||||||
|
+ found = 1;
|
||||||
|
+ }
|
||||||
|
+ if (!found) {
|
||||||
|
+ lprintf(LOG_ERR, "Interface %s not supported", intfname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'h':
|
||||||
|
+ ipmi_option_usage(progname, cmdlist, intflist);
|
||||||
|
+ rc = 0;
|
||||||
|
goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'v':
|
||||||
|
- verbose++;
|
||||||
|
- break;
|
||||||
|
- case 'c':
|
||||||
|
- csv_output = 1;
|
||||||
|
- break;
|
||||||
|
- case 'H':
|
||||||
|
- if (hostname) {
|
||||||
|
- free(hostname);
|
||||||
|
- hostname = NULL;
|
||||||
|
- }
|
||||||
|
- hostname = strdup(optarg);
|
||||||
|
- if (hostname == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ break;
|
||||||
|
+ case 'V':
|
||||||
|
+ printf("%s version %s\n", progname, VERSION);
|
||||||
|
+ rc = 0;
|
||||||
|
goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'f':
|
||||||
|
- if (password) {
|
||||||
|
- free(password);
|
||||||
|
- password = NULL;
|
||||||
|
- }
|
||||||
|
- password = ipmi_password_file_read(optarg);
|
||||||
|
- if (password == NULL)
|
||||||
|
- lprintf(LOG_ERR, "Unable to read password "
|
||||||
|
- "from file %s", optarg);
|
||||||
|
- break;
|
||||||
|
- case 'a':
|
||||||
|
-#ifdef HAVE_GETPASSPHRASE
|
||||||
|
- tmp_pass = getpassphrase("Password: ");
|
||||||
|
-#else
|
||||||
|
- tmp_pass = getpass("Password: ");
|
||||||
|
-#endif
|
||||||
|
- if (tmp_pass != NULL) {
|
||||||
|
+ break;
|
||||||
|
+ case 'd':
|
||||||
|
+ if (str2int(optarg, &devnum) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-d'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ /* Check if device number is -gt 0; I couldn't find limit for
|
||||||
|
+ * kernels > 2.6, thus right side is unlimited.
|
||||||
|
+ */
|
||||||
|
+ if (devnum < 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Device number %i is out of range.", devnum);
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'p':
|
||||||
|
+ if (str2int(optarg, &port) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-p'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ /* Check if port is -gt 0 && port is -lt 65535 */
|
||||||
|
+ if (port < 0 || port > 65535) {
|
||||||
|
+ lprintf(LOG_ERR, "Port number %i is out of range.", port);
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'C':
|
||||||
|
+ if (str2int(optarg, &cipher_suite_id) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-C'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ /* add check Cipher is -gt 0 */
|
||||||
|
+ if (cipher_suite_id < 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Cipher suite ID %i is invalid.", cipher_suite_id);
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'v':
|
||||||
|
+ verbose++;
|
||||||
|
+ break;
|
||||||
|
+ case 'c':
|
||||||
|
+ csv_output = 1;
|
||||||
|
+ break;
|
||||||
|
+ case 'H':
|
||||||
|
+ if (hostname) {
|
||||||
|
+ free(hostname);
|
||||||
|
+ hostname = NULL;
|
||||||
|
+ }
|
||||||
|
+ hostname = strdup(optarg);
|
||||||
|
+ if (hostname == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'f':
|
||||||
|
if (password) {
|
||||||
|
free(password);
|
||||||
|
password = NULL;
|
||||||
|
}
|
||||||
|
- password = strdup(tmp_pass);
|
||||||
|
- tmp_pass = NULL;
|
||||||
|
- if (password == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
+ password = ipmi_password_file_read(optarg);
|
||||||
|
+ if (password == NULL)
|
||||||
|
+ lprintf(LOG_ERR, "Unable to read password "
|
||||||
|
+ "from file %s", optarg);
|
||||||
|
+ break;
|
||||||
|
+ case 'a':
|
||||||
|
+#ifdef HAVE_GETPASSPHRASE
|
||||||
|
+ tmp_pass = getpassphrase("Password: ");
|
||||||
|
+#else
|
||||||
|
+ tmp_pass = getpass("Password: ");
|
||||||
|
+#endif
|
||||||
|
+ if (tmp_pass != NULL) {
|
||||||
|
+ if (password) {
|
||||||
|
+ free(password);
|
||||||
|
+ password = NULL;
|
||||||
|
+ }
|
||||||
|
+ password = strdup(tmp_pass);
|
||||||
|
+ tmp_pass = NULL;
|
||||||
|
+ if (password == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'k':
|
||||||
|
- if (kgkey) {
|
||||||
|
- free(kgkey);
|
||||||
|
- kgkey = NULL;
|
||||||
|
- }
|
||||||
|
- kgkey = strdup(optarg);
|
||||||
|
- if (kgkey == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'K':
|
||||||
|
- if ((tmp_env = getenv("IPMI_KGKEY"))) {
|
||||||
|
+ break;
|
||||||
|
+ case 'k':
|
||||||
|
if (kgkey) {
|
||||||
|
free(kgkey);
|
||||||
|
kgkey = NULL;
|
||||||
|
}
|
||||||
|
- kgkey = strdup(tmp_env);
|
||||||
|
+ kgkey = strdup(optarg);
|
||||||
|
if (kgkey == NULL) {
|
||||||
|
lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
goto out_free;
|
||||||
|
}
|
||||||
|
- } else {
|
||||||
|
- lprintf(LOG_WARN, "Unable to read kgkey from environment");
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'y':
|
||||||
|
- if (kgkey) {
|
||||||
|
- free(kgkey);
|
||||||
|
- kgkey = NULL;
|
||||||
|
- }
|
||||||
|
- kgkey = ipmi_parse_hex(optarg);
|
||||||
|
- if (kgkey == NULL) {
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'Y':
|
||||||
|
-#ifdef HAVE_GETPASSPHRASE
|
||||||
|
- tmp_pass = getpassphrase("Key: ");
|
||||||
|
-#else
|
||||||
|
- tmp_pass = getpass("Key: ");
|
||||||
|
-#endif
|
||||||
|
- if (tmp_pass != NULL) {
|
||||||
|
+ break;
|
||||||
|
+ case 'K':
|
||||||
|
+ if ((tmp_env = getenv("IPMI_KGKEY"))) {
|
||||||
|
+ if (kgkey) {
|
||||||
|
+ free(kgkey);
|
||||||
|
+ kgkey = NULL;
|
||||||
|
+ }
|
||||||
|
+ kgkey = strdup(tmp_env);
|
||||||
|
+ if (kgkey == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ lprintf(LOG_WARN, "Unable to read kgkey from environment");
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'y':
|
||||||
|
if (kgkey) {
|
||||||
|
free(kgkey);
|
||||||
|
kgkey = NULL;
|
||||||
|
}
|
||||||
|
- kgkey = strdup(tmp_pass);
|
||||||
|
- tmp_pass = NULL;
|
||||||
|
+ kgkey = ipmi_parse_hex(optarg);
|
||||||
|
if (kgkey == NULL) {
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'Y':
|
||||||
|
+#ifdef HAVE_GETPASSPHRASE
|
||||||
|
+ tmp_pass = getpassphrase("Key: ");
|
||||||
|
+#else
|
||||||
|
+ tmp_pass = getpass("Key: ");
|
||||||
|
+#endif
|
||||||
|
+ if (tmp_pass != NULL) {
|
||||||
|
+ if (kgkey) {
|
||||||
|
+ free(kgkey);
|
||||||
|
+ kgkey = NULL;
|
||||||
|
+ }
|
||||||
|
+ kgkey = strdup(tmp_pass);
|
||||||
|
+ tmp_pass = NULL;
|
||||||
|
+ if (kgkey == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'U':
|
||||||
|
+ if (username) {
|
||||||
|
+ free(username);
|
||||||
|
+ username = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (strlen(optarg) > 16) {
|
||||||
|
+ lprintf(LOG_ERR, "Username is too long (> 16 bytes)");
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ username = strdup(optarg);
|
||||||
|
+ if (username == NULL) {
|
||||||
|
lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
goto out_free;
|
||||||
|
}
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'U':
|
||||||
|
- if (username) {
|
||||||
|
- free(username);
|
||||||
|
- username = NULL;
|
||||||
|
- }
|
||||||
|
- if (strlen(optarg) > 16) {
|
||||||
|
- lprintf(LOG_ERR, "Username is too long (> 16 bytes)");
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- username = strdup(optarg);
|
||||||
|
- if (username == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'S':
|
||||||
|
- if (sdrcache) {
|
||||||
|
- free(sdrcache);
|
||||||
|
- sdrcache = NULL;
|
||||||
|
- }
|
||||||
|
- sdrcache = strdup(optarg);
|
||||||
|
- if (sdrcache == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'D':
|
||||||
|
- /* check for subsequent instance of -D */
|
||||||
|
- if (devfile) {
|
||||||
|
- /* free memory for previous string */
|
||||||
|
- free(devfile);
|
||||||
|
- }
|
||||||
|
- devfile = strdup(optarg);
|
||||||
|
- if (devfile == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
+ break;
|
||||||
|
+ case 'S':
|
||||||
|
+ if (sdrcache) {
|
||||||
|
+ free(sdrcache);
|
||||||
|
+ sdrcache = NULL;
|
||||||
|
+ }
|
||||||
|
+ sdrcache = strdup(optarg);
|
||||||
|
+ if (sdrcache == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'D':
|
||||||
|
+ /* check for subsequent instance of -D */
|
||||||
|
+ if (devfile) {
|
||||||
|
+ /* free memory for previous string */
|
||||||
|
+ free(devfile);
|
||||||
|
+ }
|
||||||
|
+ devfile = strdup(optarg);
|
||||||
|
+ if (devfile == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
#ifdef ENABLE_ALL_OPTIONS
|
||||||
|
- case 'o':
|
||||||
|
- if (oemtype) {
|
||||||
|
- free(oemtype);
|
||||||
|
- oemtype = NULL;
|
||||||
|
- }
|
||||||
|
- oemtype = strdup(optarg);
|
||||||
|
- if (oemtype == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- if (strncmp(oemtype, "list", 4) == 0 ||
|
||||||
|
- strncmp(oemtype, "help", 4) == 0) {
|
||||||
|
- ipmi_oem_print();
|
||||||
|
- rc = 0;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'g':
|
||||||
|
- /* backwards compatible oem hack */
|
||||||
|
- if (oemtype) {
|
||||||
|
- free(oemtype);
|
||||||
|
- oemtype = NULL;
|
||||||
|
- }
|
||||||
|
- oemtype = strdup("intelwv2");
|
||||||
|
- break;
|
||||||
|
- case 's':
|
||||||
|
- /* backwards compatible oem hack */
|
||||||
|
- if (oemtype) {
|
||||||
|
- free(oemtype);
|
||||||
|
- oemtype = NULL;
|
||||||
|
- }
|
||||||
|
- oemtype = strdup("supermicro");
|
||||||
|
- break;
|
||||||
|
- case 'P':
|
||||||
|
- if (password) {
|
||||||
|
- free(password);
|
||||||
|
- password = NULL;
|
||||||
|
- }
|
||||||
|
- password = strdup(optarg);
|
||||||
|
- if (password == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- /* Prevent password snooping with ps */
|
||||||
|
- i = strlen(optarg);
|
||||||
|
- memset(optarg, 'X', i);
|
||||||
|
- break;
|
||||||
|
- case 'E':
|
||||||
|
- if ((tmp_env = getenv("IPMITOOL_PASSWORD"))) {
|
||||||
|
- if (password) {
|
||||||
|
- free(password);
|
||||||
|
- password = NULL;
|
||||||
|
+ case 'o':
|
||||||
|
+ if (oemtype) {
|
||||||
|
+ free(oemtype);
|
||||||
|
+ oemtype = NULL;
|
||||||
|
}
|
||||||
|
- password = strdup(tmp_env);
|
||||||
|
- if (password == NULL) {
|
||||||
|
+ oemtype = strdup(optarg);
|
||||||
|
+ if (oemtype == NULL) {
|
||||||
|
lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
goto out_free;
|
||||||
|
}
|
||||||
|
- }
|
||||||
|
- else if ((tmp_env = getenv("IPMI_PASSWORD"))) {
|
||||||
|
+ if (strncmp(oemtype, "list", 4) == 0 ||
|
||||||
|
+ strncmp(oemtype, "help", 4) == 0) {
|
||||||
|
+ ipmi_oem_print();
|
||||||
|
+ rc = 0;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'g':
|
||||||
|
+ /* backwards compatible oem hack */
|
||||||
|
+ if (oemtype) {
|
||||||
|
+ free(oemtype);
|
||||||
|
+ oemtype = NULL;
|
||||||
|
+ }
|
||||||
|
+ oemtype = strdup("intelwv2");
|
||||||
|
+ break;
|
||||||
|
+ case 's':
|
||||||
|
+ /* backwards compatible oem hack */
|
||||||
|
+ if (oemtype) {
|
||||||
|
+ free(oemtype);
|
||||||
|
+ oemtype = NULL;
|
||||||
|
+ }
|
||||||
|
+ oemtype = strdup("supermicro");
|
||||||
|
+ break;
|
||||||
|
+ case 'P':
|
||||||
|
if (password) {
|
||||||
|
free(password);
|
||||||
|
password = NULL;
|
||||||
|
}
|
||||||
|
- password = strdup(tmp_env);
|
||||||
|
+ password = strdup(optarg);
|
||||||
|
if (password == NULL) {
|
||||||
|
lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
goto out_free;
|
||||||
|
}
|
||||||
|
- }
|
||||||
|
- else {
|
||||||
|
- lprintf(LOG_WARN, "Unable to read password from environment");
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'L':
|
||||||
|
- i = strlen(optarg);
|
||||||
|
- if ((i > 0) && (optarg[i-1] == '+')) {
|
||||||
|
- lookupbit = 0;
|
||||||
|
- optarg[i-1] = 0;
|
||||||
|
- }
|
||||||
|
- privlvl = str2val(optarg, ipmi_privlvl_vals);
|
||||||
|
- if (privlvl == 0xFF) {
|
||||||
|
- lprintf(LOG_WARN, "Invalid privilege level %s", optarg);
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'A':
|
||||||
|
- authtype = str2val(optarg, ipmi_authtype_session_vals);
|
||||||
|
- break;
|
||||||
|
- case 't':
|
||||||
|
- if (str2uchar(optarg, &target_addr) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-t'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'b':
|
||||||
|
- if (str2uchar(optarg, &target_channel) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-b'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'T':
|
||||||
|
- if (str2uchar(optarg, &transit_addr) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-T'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'B':
|
||||||
|
- if (str2uchar(optarg, &transit_channel) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-B'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'l':
|
||||||
|
- if (str2uchar(optarg, &target_lun) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-l'.");
|
||||||
|
- rc = 1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'm':
|
||||||
|
- if (str2uchar(optarg, &arg_addr) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-m'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'e':
|
||||||
|
- sol_escape_char = optarg[0];
|
||||||
|
- break;
|
||||||
|
- case 'O':
|
||||||
|
- if (seloem) {
|
||||||
|
- free(seloem);
|
||||||
|
- seloem = NULL;
|
||||||
|
- }
|
||||||
|
- seloem = strdup(optarg);
|
||||||
|
- if (seloem == NULL) {
|
||||||
|
- lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- case 'z':
|
||||||
|
- if (str2ushort(optarg, &my_long_packet_size) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-z'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
- }
|
||||||
|
- break;
|
||||||
|
- /* Retry and Timeout */
|
||||||
|
- case 'R':
|
||||||
|
- if (str2int(optarg, &retry) != 0 || retry < 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-R'.");
|
||||||
|
- rc = -1;
|
||||||
|
+
|
||||||
|
+ /* Prevent password snooping with ps */
|
||||||
|
+ i = strlen(optarg);
|
||||||
|
+ memset(optarg, 'X', i);
|
||||||
|
+ break;
|
||||||
|
+ case 'E':
|
||||||
|
+ if ((tmp_env = getenv("IPMITOOL_PASSWORD"))) {
|
||||||
|
+ if (password) {
|
||||||
|
+ free(password);
|
||||||
|
+ password = NULL;
|
||||||
|
+ }
|
||||||
|
+ password = strdup(tmp_env);
|
||||||
|
+ if (password == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ else if ((tmp_env = getenv("IPMI_PASSWORD"))) {
|
||||||
|
+ if (password) {
|
||||||
|
+ free(password);
|
||||||
|
+ password = NULL;
|
||||||
|
+ }
|
||||||
|
+ password = strdup(tmp_env);
|
||||||
|
+ if (password == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ lprintf(LOG_WARN, "Unable to read password from environment");
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'L':
|
||||||
|
+ i = strlen(optarg);
|
||||||
|
+ if ((i > 0) && (optarg[i-1] == '+')) {
|
||||||
|
+ lookupbit = 0;
|
||||||
|
+ optarg[i-1] = 0;
|
||||||
|
+ }
|
||||||
|
+ privlvl = str2val(optarg, ipmi_privlvl_vals);
|
||||||
|
+ if (privlvl == 0xFF) {
|
||||||
|
+ lprintf(LOG_WARN, "Invalid privilege level %s", optarg);
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'A':
|
||||||
|
+ authtype = str2val(optarg, ipmi_authtype_session_vals);
|
||||||
|
+ break;
|
||||||
|
+ case 't':
|
||||||
|
+ if (str2uchar(optarg, &target_addr) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-t'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'b':
|
||||||
|
+ if (str2uchar(optarg, &target_channel) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-b'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'T':
|
||||||
|
+ if (str2uchar(optarg, &transit_addr) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-T'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'B':
|
||||||
|
+ if (str2uchar(optarg, &transit_channel) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-B'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'l':
|
||||||
|
+ if (str2uchar(optarg, &target_lun) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-l'.");
|
||||||
|
+ rc = 1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'm':
|
||||||
|
+ if (str2uchar(optarg, &arg_addr) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-m'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'e':
|
||||||
|
+ sol_escape_char = optarg[0];
|
||||||
|
+ break;
|
||||||
|
+ case 'O':
|
||||||
|
+ if (seloem) {
|
||||||
|
+ free(seloem);
|
||||||
|
+ seloem = NULL;
|
||||||
|
+ }
|
||||||
|
+ seloem = strdup(optarg);
|
||||||
|
+ if (seloem == NULL) {
|
||||||
|
+ lprintf(LOG_ERR, "%s: malloc failure", progname);
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'z':
|
||||||
|
+ if (str2ushort(optarg, &my_long_packet_size) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-z'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ /* Retry and Timeout */
|
||||||
|
+ case 'R':
|
||||||
|
+ if (str2int(optarg, &retry) != 0 || retry < 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-R'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ case 'N':
|
||||||
|
+ if (str2uint(optarg, &timeout) != 0) {
|
||||||
|
+ lprintf(LOG_ERR, "Invalid parameter given or out of range for '-N'.");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+#endif
|
||||||
|
+ default:
|
||||||
|
+ ipmi_option_usage(progname, cmdlist, intflist);
|
||||||
|
goto out_free;
|
||||||
|
}
|
||||||
|
- break;
|
||||||
|
- case 'N':
|
||||||
|
- if (str2uint(optarg, &timeout) != 0) {
|
||||||
|
- lprintf(LOG_ERR, "Invalid parameter given or out of range for '-N'.");
|
||||||
|
- rc = -1;
|
||||||
|
- goto out_free;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* support additional arguments from environment */
|
||||||
|
+ if (argecnt == 0) {
|
||||||
|
+ argestr = getenv("IPMITOOL_ARGV");
|
||||||
|
+ if (argestr != NULL) {
|
||||||
|
+ argecnt = 0;
|
||||||
|
+ arge = malloc(sizeof(char*)*(argecnt+2));
|
||||||
|
+ arge[argecnt++] = "ipmitool-env";
|
||||||
|
+ arge[argecnt] = NULL;
|
||||||
|
+ while ((arge[argecnt] = strsep(&argestr, " ")) != NULL) {
|
||||||
|
+ narge = realloc(arge, sizeof(char*)*(argecnt+2));
|
||||||
|
+ if (narge == NULL) {
|
||||||
|
+ free(arge);
|
||||||
|
+ lprintf(LOG_ERR, "Problem while resizing options from environment.\n");
|
||||||
|
+ rc = -1;
|
||||||
|
+ goto out_free;
|
||||||
|
+ } else {
|
||||||
|
+ arge = narge;
|
||||||
|
+ }
|
||||||
|
+ arge[++argecnt] = NULL;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
- break;
|
||||||
|
-#endif
|
||||||
|
- default:
|
||||||
|
- ipmi_option_usage(progname, cmdlist, intflist);
|
||||||
|
- goto out_free;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ } while ((argecnt>1) && (arg != arge));
|
||||||
|
+ if (NULL != arge) {
|
||||||
|
+ optind = voptind;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check for command before doing anything */
|
||||||
150
ipmitool.spec
150
ipmitool.spec
@ -1,13 +1,11 @@
|
|||||||
%global gitname IPMITOOL
|
|
||||||
%global gitversion 1_8_18
|
|
||||||
|
|
||||||
Name: ipmitool
|
Name: ipmitool
|
||||||
Summary: Utility for IPMI control
|
Summary: Utility for IPMI control
|
||||||
Version: 1.8.18
|
Version: 1.8.15
|
||||||
Release: 15%{?dist}
|
Release: 4%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
|
Group: System Environment/Base
|
||||||
URL: http://ipmitool.sourceforge.net/
|
URL: http://ipmitool.sourceforge.net/
|
||||||
Source0: https://github.com/%{name}/%{name}/archive/%{gitname}_%{gitversion}/%{name}-%{version}.tar.gz
|
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
||||||
Source1: openipmi-ipmievd.sysconf
|
Source1: openipmi-ipmievd.sysconf
|
||||||
Source2: ipmievd.service
|
Source2: ipmievd.service
|
||||||
Source3: exchange-bmc-os-info.service
|
Source3: exchange-bmc-os-info.service
|
||||||
@ -15,23 +13,30 @@ Source4: exchange-bmc-os-info.sysconf
|
|||||||
Source5: set-bmc-url.sh
|
Source5: set-bmc-url.sh
|
||||||
Source6: exchange-bmc-os-info
|
Source6: exchange-bmc-os-info
|
||||||
|
|
||||||
Patch1: 0001-CVE-2011-4339-OpenIPMI.patch
|
|
||||||
# WARNING: THIS PATCH MUST BE USED FOR RAWHIDE (f26+) BRANCH
|
|
||||||
Patch2: 0002-openssl.patch
|
|
||||||
Patch3: 0003-ipmitool-1.8.11-set-kg-key.patch
|
|
||||||
Patch4: 0004-slowswid.patch
|
|
||||||
Patch5: 0005-sensor-id-length.patch
|
|
||||||
Patch6: 0006-enable-usb.patch
|
|
||||||
Patch7: 0007-check-input.patch
|
|
||||||
|
|
||||||
BuildRequires: openssl-devel readline-devel ncurses-devel
|
BuildRequires: openssl-devel readline-devel ncurses-devel
|
||||||
%{?systemd_requires}
|
BuildRequires: systemd-units
|
||||||
BuildRequires: systemd
|
|
||||||
# bootstrap
|
# bootstrap
|
||||||
BuildRequires: automake autoconf libtool
|
BuildRequires: automake autoconf libtool
|
||||||
|
Requires(post): systemd-sysv
|
||||||
|
Requires(post): systemd-units
|
||||||
|
Requires(preun): systemd-units
|
||||||
|
Requires(postun): systemd-units
|
||||||
Obsoletes: OpenIPMI-tools < 2.0.14-3
|
Obsoletes: OpenIPMI-tools < 2.0.14-3
|
||||||
Provides: OpenIPMI-tools = 2.0.14-3
|
Provides: OpenIPMI-tools = 2.0.14-3
|
||||||
|
|
||||||
|
Patch1: ipmitool-1.8.10-ipmievd-init.patch
|
||||||
|
Patch2: ipmitool-1.8.10-ipmievd-condrestart.patch
|
||||||
|
Patch3: ipmitool-1.8.11-remove-umask0.patch
|
||||||
|
# various threads. still pending.
|
||||||
|
#Patch4: cxoem-jb-cx6.patch
|
||||||
|
# pending
|
||||||
|
#Patch5: ipmitool-1.8.12-fips.patch
|
||||||
|
# pending
|
||||||
|
#Patch6: ipmitool-1.8.12-fipsman.patch
|
||||||
|
# pending https://sourceforge.net/p/ipmitool/bugs/280/
|
||||||
|
#Patch7: ipmitool-1.8.13-dualbridgedoc.patch
|
||||||
|
# TODO
|
||||||
|
Patch8: ipmitool-1.8.13-envarg.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains a utility for interfacing with devices that support
|
This package contains a utility for interfacing with devices that support
|
||||||
@ -48,17 +53,6 @@ displaying sensor values, displaying the contents of the System Event
|
|||||||
Log (SEL), printing Field Replaceable Unit (FRU) information, reading and
|
Log (SEL), printing Field Replaceable Unit (FRU) information, reading and
|
||||||
setting LAN configuration, and chassis power control.
|
setting LAN configuration, and chassis power control.
|
||||||
|
|
||||||
|
|
||||||
%package -n ipmievd
|
|
||||||
Requires: ipmitool
|
|
||||||
%{?systemd_requires}
|
|
||||||
BuildRequires: systemd
|
|
||||||
Summary: IPMI event daemon for sending events to syslog
|
|
||||||
%description -n ipmievd
|
|
||||||
ipmievd is a daemon which will listen for events from the BMC that are
|
|
||||||
being sent to the SEL and also log those messages to syslog.
|
|
||||||
|
|
||||||
|
|
||||||
%package -n bmc-snmp-proxy
|
%package -n bmc-snmp-proxy
|
||||||
Requires: net-snmp
|
Requires: net-snmp
|
||||||
Requires: exchange-bmc-os-info
|
Requires: exchange-bmc-os-info
|
||||||
@ -73,8 +67,10 @@ of net-snmp to include redirections to BMC based SNMP.
|
|||||||
Requires: hostname
|
Requires: hostname
|
||||||
Requires: ipmitool
|
Requires: ipmitool
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%{?systemd_requires}
|
Requires(post): systemd-sysv
|
||||||
BuildRequires: systemd
|
Requires(post): systemd-units
|
||||||
|
Requires(preun): systemd-units
|
||||||
|
Requires(postun): systemd-units
|
||||||
|
|
||||||
Summary: Let OS and BMC exchange info
|
Summary: Let OS and BMC exchange info
|
||||||
|
|
||||||
@ -85,7 +81,16 @@ for the host OS to use.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{gitname}_%{gitversion} -p1
|
|
||||||
|
%setup -q
|
||||||
|
%patch1 -p1 -b .ipmievd-init
|
||||||
|
%patch2 -p0 -b .condrestart
|
||||||
|
%patch3 -p1 -b .umask
|
||||||
|
#patch4 -p1 -b .cxoem
|
||||||
|
#patch5 -p0 -b .fips
|
||||||
|
#patch6 -p0 -b .fipsman
|
||||||
|
#patch7 -p1 -b .dualbridgedoc
|
||||||
|
%patch8 -p1 -b .argenv
|
||||||
|
|
||||||
for f in AUTHORS ChangeLog; do
|
for f in AUTHORS ChangeLog; do
|
||||||
iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
|
iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
|
||||||
@ -127,13 +132,13 @@ install -Dm 644 contrib/bmc-snmp-proxy.sysconf %{buildroot}%{_sysconfdir}/syscon
|
|||||||
install -Dm 644 contrib/bmc-snmp-proxy.service %{buildroot}%{_unitdir}/bmc-snmp-proxy.service
|
install -Dm 644 contrib/bmc-snmp-proxy.service %{buildroot}%{_unitdir}/bmc-snmp-proxy.service
|
||||||
install -Dm 755 contrib/bmc-snmp-proxy %{buildroot}%{_libexecdir}/bmc-snmp-proxy
|
install -Dm 755 contrib/bmc-snmp-proxy %{buildroot}%{_libexecdir}/bmc-snmp-proxy
|
||||||
|
|
||||||
%post -n ipmievd
|
%post
|
||||||
%systemd_post ipmievd.service
|
%systemd_post ipmievd.service
|
||||||
|
|
||||||
%preun -n ipmievd
|
%preun
|
||||||
%systemd_preun ipmievd.service
|
%systemd_preun ipmievd.service
|
||||||
|
|
||||||
%postun -n ipmievd
|
%postun
|
||||||
%systemd_postun_with_restart ipmievd.service
|
%systemd_postun_with_restart ipmievd.service
|
||||||
|
|
||||||
%post -n exchange-bmc-os-info
|
%post -n exchange-bmc-os-info
|
||||||
@ -157,16 +162,13 @@ install -Dm 755 contrib/bmc-snmp-proxy %{buildroot}%{_libexecdir}/bmc-sn
|
|||||||
/bin/systemctl try-restart ipmievd.service >/dev/null 2>&1 || :
|
/bin/systemctl try-restart ipmievd.service >/dev/null 2>&1 || :
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_bindir}/ipmitool
|
|
||||||
%{_mandir}/man1/ipmitool.1*
|
|
||||||
%doc %{_datadir}/doc/ipmitool
|
|
||||||
%{_datadir}/ipmitool
|
|
||||||
|
|
||||||
%files -n ipmievd
|
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/ipmievd
|
%config(noreplace) %{_sysconfdir}/sysconfig/ipmievd
|
||||||
%{_unitdir}/ipmievd.service
|
%{_unitdir}/ipmievd.service
|
||||||
%{_sbindir}/ipmievd
|
%{_bindir}/*
|
||||||
%{_mandir}/man8/ipmievd.8*
|
%{_sbindir}/*
|
||||||
|
%{_mandir}/man*/*
|
||||||
|
%doc %{_datadir}/doc/ipmitool
|
||||||
|
%{_datadir}/ipmitool
|
||||||
|
|
||||||
%files -n exchange-bmc-os-info
|
%files -n exchange-bmc-os-info
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/exchange-bmc-os-info
|
%config(noreplace) %{_sysconfdir}/sysconfig/exchange-bmc-os-info
|
||||||
@ -180,70 +182,6 @@ install -Dm 755 contrib/bmc-snmp-proxy %{buildroot}%{_libexecdir}/bmc-sn
|
|||||||
%{_libexecdir}/bmc-snmp-proxy
|
%{_libexecdir}/bmc-snmp-proxy
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-15
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.8.18-14
|
|
||||||
- Rebuild for readline 8.0
|
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-12
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Apr 10 2018 Josef Ridky <jridky@redhat.com> - 1.8.18-11
|
|
||||||
- Project moved to github
|
|
||||||
|
|
||||||
* Thu Feb 22 2018 Josef Ridky <jridky@redhat.com> - 1.8.18-10
|
|
||||||
- Spec clean up
|
|
||||||
- Add support to set kg key
|
|
||||||
- Fix DDR4 memory issues
|
|
||||||
- Increase length of sensor id
|
|
||||||
- Enable usb interface by default
|
|
||||||
- Fix input options
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-9
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 30 2018 Josef Ridky <jridky@redhat.com> - 1.8.18-8
|
|
||||||
- remove old systemd dependencies
|
|
||||||
|
|
||||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Feb 21 2017 Josef Ridky <jridky@redhat.com> - 1.8.18-5
|
|
||||||
- Fix allocation issue
|
|
||||||
|
|
||||||
* Tue Feb 21 2017 Josef Ridky <jridky@redhat.com> - 1.8.18-4
|
|
||||||
- Add support for OpenSSL-1.1.0 library (#1423743)
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.18-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.8.18-2
|
|
||||||
- Rebuild for readline 7.x
|
|
||||||
|
|
||||||
* Mon Oct 10 2016 Boris Ranto <branto@redhat.com> - 0:1.8.18-1
|
|
||||||
- New version (0:1.8.18-1)
|
|
||||||
- CVE-2011-4339 OpenIPMI
|
|
||||||
|
|
||||||
* Tue May 10 2016 Boris Ranto <branto@redhat.com> - 0:1.8.17-1
|
|
||||||
- New version (0:1.8.17-1)
|
|
||||||
- CVE-2011-4339 OpenIPMI
|
|
||||||
|
|
||||||
* Tue Feb 23 2016 Boris Ranto <branto@redhat.com> - 1.8.16-1
|
|
||||||
- Rebase to version 1.8.16
|
|
||||||
|
|
||||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.15-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Nov 24 2015 Boris Ranto <branto@redhat.com> - 1.8.15-5
|
|
||||||
- Split ipmievd bits into a separate package
|
|
||||||
|
|
||||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.15-4
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.15-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
10
sources
10
sources
@ -1,5 +1,5 @@
|
|||||||
SHA512 (exchange-bmc-os-info) = 77aad6f132b0ab56dcf8f8a5d1efbba9196c2fbb5771e5106833455a071a5dc79109d945a7adc0022f9604cbfd4a01ea1ea54ce15a2409c85f5effbf6cfc4f09
|
fcfca92bef56b9e9e57ec71f21636cc8 ipmitool-1.8.15.tar.bz2
|
||||||
SHA512 (exchange-bmc-os-info.service) = 4349e7be9879c55c64e6233f749db7d656a12b421ad53a41d612e8c891abbe108d0fabe57d5753b5c1367da4f34e2e3bb579ea4ba8bc39b81ec64b66d5f65f79
|
95bd2072031533893cd9d5d9c9603d92 exchange-bmc-os-info
|
||||||
SHA512 (exchange-bmc-os-info.sysconf) = 475f5645eb6a7038efe5568950235fa43a081f26490b7e17de2279e022950144f197e1a545177447ce1ec345862e7fb8fb802eaa3728bc9e32868e34c081263a
|
6598ee7c4ba2c8f69ef2ad48e502cada exchange-bmc-os-info.service
|
||||||
SHA512 (set-bmc-url.sh) = 99bceee522b23e0c4bc55f9e4bdc08ece9ecbf8a50511fa8f8b90ecc94d8f9715e74bb15a5f1e7c2162e7ac2e1933aff0c78b464e1010f21c784d84c0b1bfe2a
|
3a728964cb3990f3fd6febef36b4e8af exchange-bmc-os-info.sysconf
|
||||||
SHA512 (ipmitool-1.8.18.tar.gz) = 2f2b9c4ce76eb2afdac168edbd41241352c2d4d18286494ffb57dcf750f18448d144543faa8a5494f077c78a4f5ae730624d3798ba6e621249c42fd868d86406
|
b8943d4efa72aa65e2409194f8d30bdb set-bmc-url.sh
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user