zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RDSCollectionSettings table fix

Browse source
This commit is contained in:
vfedosevich 2015-03-06 03:12:01 -08:00
parent c62368596c
commit 909e942248
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Database/update_db.sql
View file

@ -5511,14 +5511,14 @@ GO
IF NOT EXISTS(SELECT * FROM sys.columns IF NOT EXISTS(SELECT * FROM sys.columns
WHERE [name] = N'SecurityLayer' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings')) WHERE [name] = N'SecurityLayer' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings'))
BEGIN BEGIN
ALTER TABLE [dbo].[RDSCollectionSettings] ADD SecurityLayer NAVRCHAR(20) null; ALTER TABLE [dbo].[RDSCollectionSettings] ADD SecurityLayer NVARCHAR(20) null;
END END
GO GO
IF NOT EXISTS(SELECT * FROM sys.columns IF NOT EXISTS(SELECT * FROM sys.columns
WHERE [name] = N'EncryptionLevel' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings')) WHERE [name] = N'EncryptionLevel' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings'))
BEGIN BEGIN
ALTER TABLE [dbo].[RDSCollectionSettings] ADD EncryptionLevel NAVRCHAR(20) null; ALTER TABLE [dbo].[RDSCollectionSettings] ADD EncryptionLevel NVARCHAR(20) null;
END END
GO GO

23
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
View file

@ -499,19 +499,22 @@ namespace WebsitePanel.EnterpriseServer
var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId)); var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId));
var settings = ObjectUtils.FillObjectFromDataReader<RdsCollectionSettings>(DataProvider.GetRdsCollectionSettingsByCollectionId(collectionId)); var settings = ObjectUtils.FillObjectFromDataReader<RdsCollectionSettings>(DataProvider.GetRdsCollectionSettingsByCollectionId(collectionId));
if (settings.SecurityLayer == null) if (settings != null)
{ {
settings.SecurityLayer = SecurityLayerValues.Negotiate.ToString(); if (settings.SecurityLayer == null)
} {
settings.SecurityLayer = SecurityLayerValues.Negotiate.ToString();
}
if (settings.EncryptionLevel == null) if (settings.EncryptionLevel == null)
{ {
settings.EncryptionLevel = EncryptionLevel.ClientCompatible.ToString(); settings.EncryptionLevel = EncryptionLevel.ClientCompatible.ToString();
} }
if (settings.AuthenticateUsingNLA == null) if (settings.AuthenticateUsingNLA == null)
{ {
settings.AuthenticateUsingNLA = true; settings.AuthenticateUsingNLA = true;
}
} }
return settings; return settings;