Commit 8243b154 authored by Brian Kroth's avatar Brian Kroth

allow and default to NULL key_privlvl

parent a0d96e0c
......@@ -3528,8 +3528,9 @@ CREATE TABLE `outlets_remoteauth` (
`key_uid` varchar(64) NOT NULL default '',
`mykey` text NOT NULL,
-- NOTE: These are mostly pulled from ipmitool. Other protocols may need
-- other values or not care at all, hence the addition of OTHER to the list.
`key_privlvl` enum('CALLBACK','USER','OPERATOR','ADMINISTRATOR','OTHER') NOT NULL DEFAULT 'ADMINISTRATOR',
-- other values or not care at all, hence the addition of OTHER to the
-- list and a default of NULL.
`key_privlvl` enum('CALLBACK','USER','OPERATOR','ADMINISTRATOR','OTHER') DEFAULT NULL,
PRIMARY KEY (`node_id`,`key_type`,`key_role`,`key_uid`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
......
......@@ -12,11 +12,10 @@ sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
DBQueryFatal(<<SQL
DBQueryFatal(<<'SQL'
ALTER TABLE outlets_remoteauth
ADD COLUMN key_privlvl
ENUM ('CALLBACK', 'USER', 'OPERATOR', 'ADMINISTRATOR', 'OTHER')
NOT NULL DEFAULT 'ADMINISTRATOR'
ENUM ('CALLBACK', 'USER', 'OPERATOR', 'ADMINISTRATOR', 'OTHER') DEFAULT NULL
SQL
);
return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment