Land #9011, revert changes that hung getsystem/getprivs

bug/bundler_fix
Brent Cook 2017-09-27 08:38:56 -05:00
commit e39b7fd859
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
3 changed files with 4 additions and 9 deletions

View File

@ -170,10 +170,7 @@ class Config
ret = []
res = client.send_request(req)
res.each(TLV_TYPE_PRIVILEGE) do |p|
ret << {
priv: p.get_tlv_value(TLV_TYPE_PRIVILEGE_NAME),
enabled: p.get_tlv_value(TLV_TYPE_PRIVILEGE_ENABLED),
}
ret << p.value
end
ret
end

View File

@ -16,9 +16,7 @@ TLV_TYPE_HANDLE = TLV_META_TYPE_QWORD | 600
TLV_TYPE_INHERIT = TLV_META_TYPE_BOOL | 601
TLV_TYPE_PROCESS_HANDLE = TLV_META_TYPE_QWORD | 630
TLV_TYPE_THREAD_HANDLE = TLV_META_TYPE_QWORD | 631
TLV_TYPE_PRIVILEGE = TLV_META_TYPE_GROUP | 632
TLV_TYPE_PRIVILEGE_NAME = TLV_META_TYPE_STRING | 633
TLV_TYPE_PRIVILEGE_ENABLED = TLV_META_TYPE_BOOL | 634
TLV_TYPE_PRIVILEGE = TLV_META_TYPE_STRING | 632
##
#

View File

@ -899,12 +899,12 @@ class Console::CommandDispatcher::Stdapi::Sys
'Header' => 'Enabled Process Privileges',
'Indent' => 0,
'SortIndex' => 1,
'Columns' => ['Priv Name', 'Enabled']
'Columns' => ['Name']
)
privs = client.sys.config.getprivs
client.sys.config.getprivs.each do |priv|
table << [priv[:priv], priv[:enabled].to_s]
table << [priv]
end
print_line