diff options
author | Gordon Sim <gsim@apache.org> | 2016-03-08 21:28:25 +0000 |
---|---|---|
committer | Gordon Sim <gsim@apache.org> | 2016-03-08 21:28:25 +0000 |
commit | 92e6d3147fb77dc9a16db666a7716d3446b5a8f9 (patch) | |
tree | d37d709b9286c82ac9f76df85042ac04ec1d9d4b | |
parent | 159033fb800b1316170e19c91df40e9a89e7699c (diff) | |
download | qpid-python-92e6d3147fb77dc9a16db666a7716d3446b5a8f9.tar.gz |
QPID-7130: [PATCH 5/5] Deleted old getClientAuthId function that was replaced by
getPeerAuthId.
Patch from Domen Vrankar <domen.vrankar@halcom.si>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1734163 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/src/qpid/sys/Socket.h | 1 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp | 2 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp | 5 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/posix/BSDSocket.h | 1 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp | 5 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/ssl/SslSocket.h | 1 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp | 2 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/windows/WinSocket.cpp | 5 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/windows/WinSocket.h | 1 |
9 files changed, 2 insertions, 21 deletions
diff --git a/qpid/cpp/src/qpid/sys/Socket.h b/qpid/cpp/src/qpid/sys/Socket.h index 2cbf0e84c9..d2bbde8f9a 100644 --- a/qpid/cpp/src/qpid/sys/Socket.h +++ b/qpid/cpp/src/qpid/sys/Socket.h @@ -109,7 +109,6 @@ public: /* Transport security related: */ virtual int getKeyLen() const = 0; - virtual std::string getClientAuthId() const = 0; virtual std::string getPeerAuthId() const = 0; virtual std::string getLocalAuthId() const = 0; }; diff --git a/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp index 870c22bcd3..a05e66f545 100644 --- a/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp +++ b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp @@ -620,7 +620,7 @@ void AsynchIO::close(DispatchHandle& h) { SecuritySettings AsynchIO::getSecuritySettings() { SecuritySettings settings; settings.ssf = socket.getKeyLen(); - settings.authid = socket.getClientAuthId(); + settings.authid = socket.getPeerAuthId(); return settings; } diff --git a/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp b/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp index 15c2b30242..12066642ac 100644 --- a/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp +++ b/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp @@ -271,11 +271,6 @@ int BSDSocket::getKeyLen() const return 0; } -std::string BSDSocket::getClientAuthId() const -{ - return std::string(); -} - std::string BSDSocket::getPeerAuthId() const { return std::string(); diff --git a/qpid/cpp/src/qpid/sys/posix/BSDSocket.h b/qpid/cpp/src/qpid/sys/posix/BSDSocket.h index b0d1f1c9c8..e8373f6df9 100644 --- a/qpid/cpp/src/qpid/sys/posix/BSDSocket.h +++ b/qpid/cpp/src/qpid/sys/posix/BSDSocket.h @@ -71,7 +71,6 @@ public: QPID_COMMON_EXTERN virtual void close() const; QPID_COMMON_EXTERN virtual int getKeyLen() const; - QPID_COMMON_EXTERN virtual std::string getClientAuthId() const; QPID_COMMON_EXTERN virtual std::string getPeerAuthId() const; QPID_COMMON_EXTERN virtual std::string getLocalAuthId() const; diff --git a/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp index 815e2be8e4..731151caf1 100644 --- a/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp +++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp @@ -396,11 +396,6 @@ int SslSocket::getKeyLen() const return 0; } -std::string SslSocket::getClientAuthId() const -{ - return getAuthId(PeerCertificateGetter(nssSocket)); -} - std::string SslSocket::getPeerAuthId() const { return getAuthId(PeerCertificateGetter(nssSocket)); diff --git a/qpid/cpp/src/qpid/sys/ssl/SslSocket.h b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h index d8f9f43605..733a47aee5 100644 --- a/qpid/cpp/src/qpid/sys/ssl/SslSocket.h +++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h @@ -67,7 +67,6 @@ public: void close() const; int getKeyLen() const; - std::string getClientAuthId() const; std::string getPeerAuthId() const; std::string getLocalAuthId() const; diff --git a/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp index d65aad1304..a5b07ce448 100644 --- a/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp +++ b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp @@ -527,7 +527,7 @@ void AsynchIO::close(void) { SecuritySettings AsynchIO::getSecuritySettings() { SecuritySettings settings; settings.ssf = socket.getKeyLen(); - settings.authid = socket.getClientAuthId(); + settings.authid = socket.getPeerAuthId(); return settings; } diff --git a/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp b/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp index 601accd938..aada990c11 100644 --- a/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp +++ b/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp @@ -273,11 +273,6 @@ int WinSocket::getKeyLen() const return 0; } -std::string WinSocket::getClientAuthId() const -{ - return std::string(); -} - std::string WinSocket::getPeerAuthId() const { return std::string(); diff --git a/qpid/cpp/src/qpid/sys/windows/WinSocket.h b/qpid/cpp/src/qpid/sys/windows/WinSocket.h index c8c59d5160..619c14437e 100644 --- a/qpid/cpp/src/qpid/sys/windows/WinSocket.h +++ b/qpid/cpp/src/qpid/sys/windows/WinSocket.h @@ -99,7 +99,6 @@ public: QPID_COMMON_EXTERN virtual int write(const void *buf, size_t count) const; QPID_COMMON_EXTERN int getKeyLen() const; - QPID_COMMON_EXTERN std::string getClientAuthId() const; QPID_COMMON_EXTERN std::string getPeerAuthId() const; QPID_COMMON_EXTERN std::string getLocalAuthId() const; |