aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Core/ApplicationHost.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-10 15:12:03 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-10 15:12:03 -0400
commit369df3ffdaa8da2f687ad6c1028aa955d219f34e (patch)
tree7d49a62342f0f59cf981a268ae6d0881f930390f /Emby.Server.Core/ApplicationHost.cs
parente9ea1d4ce27452b0c29d08f5dec6f4363aee9d14 (diff)
add smb fixes
Diffstat (limited to 'Emby.Server.Core/ApplicationHost.cs')
-rw-r--r--Emby.Server.Core/ApplicationHost.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs
index 6a3881caf..5ceef0754 100644
--- a/Emby.Server.Core/ApplicationHost.cs
+++ b/Emby.Server.Core/ApplicationHost.cs
@@ -761,7 +761,10 @@ namespace Emby.Server.Core
return null;
}
- X509Certificate2 localCert = new X509Certificate2(certificateLocation, info.Password);
+ // Don't use an empty string password
+ var password = string.IsNullOrWhiteSpace(info.Password) ? null : info.Password;
+
+ X509Certificate2 localCert = new X509Certificate2(certificateLocation, password);
//localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
if (!localCert.HasPrivateKey)
{