Merge branch 'unstable' of git://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole-auth-mysql into unstable

This commit is contained in:
Michael Jumper
2013-02-26 00:24:14 -08:00
2 changed files with 6 additions and 1 deletions

View File

@@ -2,3 +2,8 @@ insert into guacamole_user values(1, 'guacadmin', x'AE97B20D5B24B2F18BE7921E3C0C
insert into guacamole_system_permission values(1, 'CREATE_CONNECTION');
insert into guacamole_system_permission values(1, 'CREATE_USER');
insert into guacamole_user_permission values(1, 1, 'READ');
insert into guacamole_user_permission values(1, 1, 'UPDATE');
insert into guacamole_user_permission values(1, 1, 'DELETE');
insert into guacamole_user_permission values(1, 1, 'ADMINISTER');

View File

@@ -44,7 +44,7 @@ CREATE TABLE `guacamole_connection_permission` (
`connection_id` int(11) NOT NULL,
`permission` enum('READ','UPDATE','DELETE','ADMINISTER') NOT NULL,
PRIMARY KEY (`user_id`,`connection_id`,`permission`),
CONSTRAINT `guacamole_connection_permission_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `guacamole_connection` (`connection_id`),
CONSTRAINT `guacamole_connection_permission_ibfk_1` FOREIGN KEY (`connection_id`) REFERENCES `guacamole_connection` (`connection_id`),
CONSTRAINT `guacamole_connection_permission_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `guacamole_user` (`user_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;