From 636d2ebefbfeb808833d29c5eb540fe9efd93b36 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Date: Thu, 5 Jun 2014 19:42:25 -0400
Subject: [PATCH] configurationmanager: remove unused parameter
Change-Id: Iaaf228e155a74181279e00dea6c0d7c22ba7943d
Refs: #49172
---
daemon/src/client/configurationmanager.cpp | 3 ++-
daemon/src/client/configurationmanager.h | 3 ++-
daemon/src/client/dbus/configurationmanager-introspec.xml | 2 --
gnome/src/dbus/configurationmanager-introspec.xml | 2 --
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/daemon/src/client/configurationmanager.cpp b/daemon/src/client/configurationmanager.cpp
index 3a38d63b7d..b0661d34ed 100644
--- a/daemon/src/client/configurationmanager.cpp
+++ b/daemon/src/client/configurationmanager.cpp
@@ -566,7 +566,8 @@ bool ConfigurationManager::checkCertificateValidity(const std::string& caPath,
#endif
}
-bool ConfigurationManager::checkHostnameCertificate(const std::string& certificatePath, const std::string& host, const std::string& port)
+bool ConfigurationManager::checkHostnameCertificate(const std::string& host,
+ const std::string& port)
{
#if HAVE_TLS
return verifyHostnameCertificate(host.c_str(),
diff --git a/daemon/src/client/configurationmanager.h b/daemon/src/client/configurationmanager.h
index c64018cfa5..47e0c2d629 100644
--- a/daemon/src/client/configurationmanager.h
+++ b/daemon/src/client/configurationmanager.h
@@ -168,7 +168,8 @@ class ConfigurationManager
bool checkForPrivateKey(const std::string& pemPath);
bool checkCertificateValidity(const std::string& caPath,
const std::string& pemPath);
- bool checkHostnameCertificate(const std::string& certificatePath, const std::string& host, const std::string& port);
+ bool checkHostnameCertificate(const std::string& host,
+ const std::string& port);
/* the following signals must be implemented manually for any
* platform or configuration that does not supply dbus */
diff --git a/daemon/src/client/dbus/configurationmanager-introspec.xml b/daemon/src/client/dbus/configurationmanager-introspec.xml
index 89e4a6d3d5..9fdfed6992 100644
--- a/daemon/src/client/dbus/configurationmanager-introspec.xml
+++ b/daemon/src/client/dbus/configurationmanager-introspec.xml
@@ -639,8 +639,6 @@
</method>
<method name="checkHostnameCertificate" tp:name-for-bindings="checkHostnameCertificate">
- <arg type="s" name="pemPath" direction="in">
- </arg>
<arg type="s" name="host" direction="in">
</arg>
<arg type="s" name="port" direction="in">
diff --git a/gnome/src/dbus/configurationmanager-introspec.xml b/gnome/src/dbus/configurationmanager-introspec.xml
index 89e4a6d3d5..9fdfed6992 100644
--- a/gnome/src/dbus/configurationmanager-introspec.xml
+++ b/gnome/src/dbus/configurationmanager-introspec.xml
@@ -639,8 +639,6 @@
</method>
<method name="checkHostnameCertificate" tp:name-for-bindings="checkHostnameCertificate">
- <arg type="s" name="pemPath" direction="in">
- </arg>
<arg type="s" name="host" direction="in">
</arg>
<arg type="s" name="port" direction="in">
--
GitLab