summaryrefslogtreecommitdiffstats
path: root/lib/private/Server.php
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2017-01-09 14:26:31 +0100
committerRobin Appelman <robin@icewind.nl>2017-01-09 16:51:27 +0100
commit817e974c5ffc2de4732316114fdcb4f30ac292de (patch)
tree7278e0a28bf8ecb9b4b861dc9c2c82eec18b39a9 /lib/private/Server.php
parentae934cbdab07cfa14baae1b71b031d2eb53c8d67 (diff)
downloadnextcloud-server-817e974c5ffc2de4732316114fdcb4f30ac292de.tar.gz
nextcloud-server-817e974c5ffc2de4732316114fdcb4f30ac292de.zip
dont write a certificate bundle if the shipped ca bundle is empty
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r--lib/private/Server.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index cc295dccd17..147fa89582a 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -482,7 +482,7 @@ class Server extends ServerContainer implements IServerContainer {
$uid = $user ? $user : null;
return new ClientService(
$c->getConfig(),
- new \OC\Security\CertificateManager($uid, new View(), $c->getConfig())
+ new \OC\Security\CertificateManager($uid, new View(), $c->getConfig(), $c->getLogger())
);
});
$this->registerService('EventLogger', function (Server $c) {
@@ -1220,7 +1220,7 @@ class Server extends ServerContainer implements IServerContainer {
}
$userId = $user->getUID();
}
- return new CertificateManager($userId, new View(), $this->getConfig());
+ return new CertificateManager($userId, new View(), $this->getConfig(), $this->getLogger());
}
/**