From 6d1f8521e666b7acaa004bcbcd55ed6281d143bb Mon Sep 17 00:00:00 2001 From: Jeremy Ellington Date: Wed, 9 Mar 2005 20:29:35 +0000 Subject: [PATCH] Removed calls to ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN) in the sub-commands. We are ADMIN by default. --- ipmitool/lib/ipmi_channel.c | 4 ---- ipmitool/lib/ipmi_chassis.c | 10 ---------- ipmitool/lib/ipmi_event.c | 5 ----- ipmitool/lib/ipmi_lanp.c | 2 -- ipmitool/lib/ipmi_mc.c | 2 -- ipmitool/lib/ipmi_sel.c | 2 -- ipmitool/lib/ipmi_sensor.c | 2 -- ipmitool/lib/ipmi_user.c | 2 -- 8 files changed, 29 deletions(-) diff --git a/ipmitool/lib/ipmi_channel.c b/ipmitool/lib/ipmi_channel.c index 4748504..87ca238 100644 --- a/ipmitool/lib/ipmi_channel.c +++ b/ipmitool/lib/ipmi_channel.c @@ -356,8 +356,6 @@ ipmi_get_user_access(struct ipmi_intf * intf, uint8_t channel, uint8_t userid) struct get_user_access_rsp user_access; int curr_uid, max_uid = 0, init = 1; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - curr_uid = userid ? : 1; memset(&req1, 0, sizeof(req1)); @@ -444,8 +442,6 @@ ipmi_set_user_access(struct ipmi_intf * intf, int argc, char ** argv) struct set_user_access_data set_access; int i; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - if ((argc < 3) || (strncmp(argv[0], "help", 4) == 0)) { printf_channel_usage(); return 0; diff --git a/ipmitool/lib/ipmi_chassis.c b/ipmitool/lib/ipmi_chassis.c index 08ad1fb..773f7e2 100644 --- a/ipmitool/lib/ipmi_chassis.c +++ b/ipmitool/lib/ipmi_chassis.c @@ -89,8 +89,6 @@ ipmi_chassis_power_control(struct ipmi_intf * intf, uint8_t ctl) struct ipmi_rs * rsp; struct ipmi_rq req; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - memset(&req, 0, sizeof(req)); req.msg.netfn = IPMI_NETFN_CHASSIS; req.msg.cmd = 0x2; @@ -130,8 +128,6 @@ ipmi_chassis_identify(struct ipmi_intf * intf, char * arg) uint8_t force_on; } identify_data; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - memset(&req, 0, sizeof(req)); req.msg.netfn = IPMI_NETFN_CHASSIS; req.msg.cmd = 0x4; @@ -367,8 +363,6 @@ ipmi_chassis_set_bootparam(struct ipmi_intf * intf, uint8_t param, uint8_t * dat struct ipmi_rq req; uint8_t msg_data[16]; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - memset(msg_data, 0, 16); msg_data[0] = param & 0x7f; memcpy(msg_data+1, data, len); @@ -442,8 +436,6 @@ ipmi_chassis_set_bootflag(struct ipmi_intf * intf, char * arg) uint8_t flags[5]; int rc = 0; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - if (arg == NULL) { lprintf(LOG_ERR, "No bootflag argument supplied"); return -1; @@ -481,8 +473,6 @@ ipmi_chassis_power_policy(struct ipmi_intf * intf, uint8_t policy) struct ipmi_rs * rsp; struct ipmi_rq req; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - memset(&req, 0, sizeof(req)); req.msg.netfn = IPMI_NETFN_CHASSIS; req.msg.cmd = 0x6; diff --git a/ipmitool/lib/ipmi_event.c b/ipmitool/lib/ipmi_event.c index 68fb57c..7ede79d 100644 --- a/ipmitool/lib/ipmi_event.c +++ b/ipmitool/lib/ipmi_event.c @@ -63,8 +63,6 @@ ipmi_send_platform_event(struct ipmi_intf * intf, int num) uint8_t chmed; int p = 0; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - memset(&req, 0, sizeof(req)); memset(rqdata, 0, 8); @@ -150,9 +148,6 @@ ipmi_event_fromfile(struct ipmi_intf * intf, char * file) if (file == NULL) return -1; - /* must be admin privilege to do this */ - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - memset(rqdata, 0, 8); /* setup Platform Event Message command */ diff --git a/ipmitool/lib/ipmi_lanp.c b/ipmitool/lib/ipmi_lanp.c index 0f25eab..08d3a3b 100644 --- a/ipmitool/lib/ipmi_lanp.c +++ b/ipmitool/lib/ipmi_lanp.c @@ -1309,8 +1309,6 @@ ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv) return -1; } - /* all the lan parameters commands need admin level */ - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); if ((strncmp(argv[0], "printconf", 9) == 0) || (strncmp(argv[0], "print", 5) == 0)) { diff --git a/ipmitool/lib/ipmi_mc.c b/ipmitool/lib/ipmi_mc.c index ea74b00..4bbcb49 100644 --- a/ipmitool/lib/ipmi_mc.c +++ b/ipmitool/lib/ipmi_mc.c @@ -219,8 +219,6 @@ ipmi_mc_set_enables(struct ipmi_intf * intf, int argc, char ** argv) uint8_t en; int i; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - if (argc < 1 || strncmp(argv[0], "help", 4) == 0) { printf_mc_usage(); return 0; diff --git a/ipmitool/lib/ipmi_sel.c b/ipmitool/lib/ipmi_sel.c index 672ab4d..c7d8745 100644 --- a/ipmitool/lib/ipmi_sel.c +++ b/ipmitool/lib/ipmi_sel.c @@ -796,8 +796,6 @@ ipmi_sel_clear(struct ipmi_intf * intf) uint16_t reserve_id; uint8_t msg_data[6]; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - reserve_id = ipmi_sel_reserve(intf); if (reserve_id == 0) return -1; diff --git a/ipmitool/lib/ipmi_sensor.c b/ipmitool/lib/ipmi_sensor.c index 38da3f1..b17afb5 100644 --- a/ipmitool/lib/ipmi_sensor.c +++ b/ipmitool/lib/ipmi_sensor.c @@ -532,8 +532,6 @@ ipmi_sensor_set_threshold(struct ipmi_intf * intf, int argc, char ** argv) return 0; } - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - id = argv[0]; thresh = argv[1]; setting = (float)atof(argv[2]); diff --git a/ipmitool/lib/ipmi_user.c b/ipmitool/lib/ipmi_user.c index 08f16c1..8ccd77f 100644 --- a/ipmitool/lib/ipmi_user.c +++ b/ipmitool/lib/ipmi_user.c @@ -484,8 +484,6 @@ ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv) { int retval = 0; - ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN); - /* * Help */