deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hook ipmi_lan_set_password() to _ipmi_set_user_password()

Browse Source 
Commit hooks ipmi_lan_set_password() to _ipmi_set_user_password() in order to
get rid off code duplication.
This commit is contained in:
Zdenek Styblik 2015-01-30 07:47:52 +01:00
parent 66eee40df4
commit 90e2134413
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/ipmi_lanp.c
View File

@ -53,6 +53,7 @@
#include <ipmitool/ipmi_strings.h> #include <ipmitool/ipmi_strings.h>
#include <ipmitool/ipmi_lanp.h> #include <ipmitool/ipmi_lanp.h>
#include <ipmitool/ipmi_channel.h> #include <ipmitool/ipmi_channel.h>
#include <ipmitool/ipmi_user.h>
extern int verbose; extern int verbose;
@ -912,45 +913,24 @@ ipmi_lan_set_auth(struct ipmi_intf * intf, uint8_t chan, char * level, char * ty
return set_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE_ENABLE, data, 5); return set_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE_ENABLE, data, 5);
} }
/* TODO - we already have set user password in ipmi_user! */
static int static int
ipmi_lan_set_password(struct ipmi_intf * intf, ipmi_lan_set_password(struct ipmi_intf *intf,
uint8_t userid, uint8_t * password) uint8_t user_id, const char *password)
{ {
struct ipmi_rs * rsp; int ccode = 0;
struct ipmi_rq req; ccode = _ipmi_set_user_password(intf, user_id,
uint8_t data[18]; IPMI_PASSWORD_SET_PASSWORD, password, 0);
if (eval_ccode(ccode) != 0) {
memset(&data, 0, sizeof(data)); lprintf(LOG_ERR, "Unable to Set LAN Password for user %d",
data[0] = userid & 0x3f;/* user ID */ user_id);
data[1] = 0x02; /* set password */ return (-1);
if (password != NULL)
memcpy(data+2, password, __min(strlen((const char *)password), 16));
memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_APP;
req.msg.cmd = 0x47;
req.msg.data = data;
req.msg.data_len = 18;
rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Unable to Set LAN Password for user %d", userid);
return -1;
} }
if (rsp->ccode > 0) {
lprintf(LOG_ERR, "Set LAN Password for user %d failed: %s",
userid, val2str(rsp->ccode, completion_code_vals));
return -1;
}
/* adjust our session password /* adjust our session password
* or we will no longer be able to communicate with BMC * or we will no longer be able to communicate with BMC
*/ */
ipmi_intf_session_set_password(intf, (char *)password); ipmi_intf_session_set_password(intf, (char *)password);
printf("Password %s for user %d\n", printf("Password %s for user %d\n",
(password == NULL) ? "cleared" : "set", userid); (password == NULL) ? "cleared" : "set", user_id);
return 0; return 0;
} }
@ -1506,7 +1486,7 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
/* session password /* session password
* not strictly a lan setting, but its used for lan connections */ * not strictly a lan setting, but its used for lan connections */
else if (strncmp(argv[1], "password", 8) == 0) { else if (strncmp(argv[1], "password", 8) == 0) {
rc = ipmi_lan_set_password(intf, 1, (uint8_t *)argv[2]); rc = ipmi_lan_set_password(intf, 1, argv[2]);
} }
/* snmp community string */ /* snmp community string */
else if (strncmp(argv[1], "snmp", 4) == 0) { else if (strncmp(argv[1], "snmp", 4) == 0) {