diff -Nru kldap-17.12.3/autotests/testkldap.cpp kldap-18.04.1/autotests/testkldap.cpp --- kldap-17.12.3/autotests/testkldap.cpp 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/autotests/testkldap.cpp 2018-04-21 13:57:39.000000000 +0000 @@ -49,9 +49,6 @@ The specified server should not be a production server in case we break anything here. You have been warned! */ - m_search = nullptr; - m_model = nullptr; - QString filename(QStringLiteral("testurl.txt")); QFile file(filename); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -59,8 +56,6 @@ stream >> m_url; file.close(); } -// else -// QCOMPARE( 0, 1 ); m_search = new LdapSearch; @@ -166,6 +161,31 @@ QCOMPARE(url.filter(), QStringLiteral("(objectClass=*)")); QCOMPARE(url.extension(QStringLiteral("x-dir"), critical), QStringLiteral("base")); + QCOMPARE(url.query(), QStringLiteral("?cn,mail?sub??x-dir=base")); + // For some reason the code removes the filter if it's (objectClass=*)... + QCOMPARE(url.toString(), QStringLiteral("ldap://cn=manager,dc=kde,dc=org:password@localhost:3999/" + "dc=kde,dc=org??cn,mail?sub??x-dir=base")); + + // Now set a different filter + url.setFilter(QStringLiteral("(objectclass=person)")); + QCOMPARE(url.toDisplayString(), QStringLiteral("ldap://cn=manager,dc=kde,dc=org@localhost:3999/" + "dc=kde,dc=org??cn,mail?sub?%28objectclass%3Dperson%29?x-dir=base")); + QCOMPARE(url.filter(), QStringLiteral("(objectclass=person)")); + + // And now a filter with non-ascii letters + url.setFilter(QString::fromUtf8("(givenName=Valérie *)")); + QCOMPARE(url.toDisplayString(), QString::fromUtf8("ldap://cn=manager,dc=kde,dc=org@localhost:3999/" + "dc=kde,dc=org??cn,mail?sub?%28givenName%3DValérie %2A%29?x-dir=base")); + QCOMPARE(url.filter(), QStringLiteral("(givenName=Valérie *)")); + + // Test roundtrip via QUrl, as happens when sending it to kio_ldap + const QUrl qurl(url); + QCOMPARE(qurl.toDisplayString(), url.toDisplayString()); + + const LdapUrl kiourl(qurl); + QCOMPARE(kiourl.toString(), url.toString()); + QCOMPARE(kiourl.toDisplayString(), url.toDisplayString()); + QCOMPARE(kiourl.filter(), QStringLiteral("(givenName=Valérie *)")); } void KLdapTest::testLdapConnection() diff -Nru kldap-17.12.3/cmake/CMakeLists.txt kldap-18.04.1/cmake/CMakeLists.txt --- kldap-17.12.3/cmake/CMakeLists.txt 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/cmake/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -install(FILES - FindLdap.cmake - FindSasl2.cmake - DESTINATION ${CMAKECONFIG_INSTALL_DIR} -) diff -Nru kldap-17.12.3/cmake/COPYING-CMAKE-SCRIPTS kldap-18.04.1/cmake/COPYING-CMAKE-SCRIPTS --- kldap-17.12.3/cmake/COPYING-CMAKE-SCRIPTS 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/cmake/COPYING-CMAKE-SCRIPTS 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru kldap-17.12.3/cmake/FindLdap.cmake kldap-18.04.1/cmake/FindLdap.cmake --- kldap-17.12.3/cmake/FindLdap.cmake 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/cmake/FindLdap.cmake 2018-04-21 13:57:39.000000000 +0000 @@ -33,7 +33,7 @@ # #============================================================================= # Copyright 2006 Szombathelyi György -# Copyright 2007-2017 Laurent Montel +# Copyright 2007-2018 Laurent Montel # # # Redistribution and use in source and binary forms, with or without diff -Nru kldap-17.12.3/cmake/FindSasl2.cmake kldap-18.04.1/cmake/FindSasl2.cmake --- kldap-17.12.3/cmake/FindSasl2.cmake 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/cmake/FindSasl2.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -#.rst: -# FindSasl2 -# --------- -# -# Try to find the SASL2 library. -# -# This will define the following variables: -# -# ``Sasl2_FOUND`` -# System has SASL2. -# -# ``Sasl2_VERSION`` -# The version of SASL2. -# -# ``Sasl2_INCLUDE_DIRS`` -# This should be passed to target_include_directories() if -# the target is not used for linking. -# -# ``Sasl2_LIBRARIES`` -# The SASL2 library. -# This can be passed to target_link_libraries() instead of -# the ``Sasl2::Sasl2`` target -# -# If ``Sasl2_FOUND`` is TRUE, the following imported target -# will be available: -# -# ``Sasl2::Sasl2`` -# The SASL2 library -# -# Since pre-5.0.0. -# -# Imported target since 5.1.41 -# -#============================================================================= -# Copyright 2006, 2007 Laurent Montel -# -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#============================================================================= - -# NOTE: libsasl2.pc doesn't export the include dir. -find_package(PkgConfig QUIET) -pkg_check_modules(PC_Sasl2 libsasl2) - -find_path(Sasl2_INCLUDE_DIRS NAMES sasl/sasl.h) - -# libsasl2 add for windows, because the windows package of cyrus-sasl2 -# contains a libsasl2 also for msvc which is not standard conform -find_library(Sasl2_LIBRARIES - NAMES sasl2 libsasl2 - HINTS ${PC_Sasl2_LIBRARY_DIRS} -) - -set(Sasl2_VERSION ${PC_Sasl2_VERSION}) - -if(NOT Sasl2_VERSION) - if(EXISTS ${Sasl2_INCLUDE_DIRS}/sasl/sasl.h) - file(READ ${Sasl2_INCLUDE_DIRS}/sasl/sasl.h SASL2_H_CONTENT) - string(REGEX MATCH "#define SASL_VERSION_MAJOR[ ]+[0-9]+" SASL2_VERSION_MAJOR_MATCH ${SASL2_H_CONTENT}) - string(REGEX MATCH "#define SASL_VERSION_MINOR[ ]+[0-9]+" SASL2_VERSION_MINOR_MATCH ${SASL2_H_CONTENT}) - string(REGEX MATCH "#define SASL_VERSION_STEP[ ]+[0-9]+" SASL2_VERSION_STEP_MATCH ${SASL2_H_CONTENT}) - - string(REGEX REPLACE ".*_MAJOR[ ]+(.*)" "\\1" SASL2_VERSION_MAJOR ${SASL2_VERSION_MAJOR_MATCH}) - string(REGEX REPLACE ".*_MINOR[ ]+(.*)" "\\1" SASL2_VERSION_MINOR ${SASL2_VERSION_MINOR_MATCH}) - string(REGEX REPLACE ".*_STEP[ ]+(.*)" "\\1" SASL2_VERSION_STEP ${SASL2_VERSION_STEP_MATCH}) - - set(Sasl2_VERSION "${SASL2_VERSION_MAJOR}.${SASL2_VERSION_MINOR}.${SASL2_VERSION_STEP}") - endif() -endif() - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(Sasl2 - FOUND_VAR Sasl2_FOUND - REQUIRED_VARS Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS - VERSION_VAR Sasl2_VERSION -) -if(Sasl2_FOUND AND NOT TARGET Sasl2::Sasl2) - add_library(Sasl2::Sasl2 UNKNOWN IMPORTED) - set_target_properties(Sasl2::Sasl2 PROPERTIES - IMPORTED_LOCATION "${Sasl2_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${Sasl2_INCLUDE_DIRS}") -endif() - -mark_as_advanced(Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS Sasl2_VERSION) - -include(FeatureSummary) -set_package_properties(Sasl2 PROPERTIES - URL "http://www.cyrussasl.org/" - DESCRIPTION "The Cyrus-sasl library." -) - diff -Nru kldap-17.12.3/CMakeLists.txt kldap-18.04.1/CMakeLists.txt --- kldap-17.12.3/CMakeLists.txt 2018-03-06 00:27:42.000000000 +0000 +++ kldap-18.04.1/CMakeLists.txt 2018-05-08 00:21:04.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.3") +set(PIM_VERSION "5.8.1") project(KLdap VERSION ${PIM_VERSION}) # ECM setup -set(KF5_VERSION "5.39.0") +set(KF5_VERSION "5.44.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${KLdap_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) @@ -21,8 +21,6 @@ include(ECMQtDeclareLoggingCategory) include(ECMCoverageOption) - - set(KLDAP_LIB_VERSION ${PIM_VERSION}) find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) @@ -89,7 +87,6 @@ ) ########### Targets ########### -add_subdirectory(cmake) add_subdirectory(src) add_subdirectory(kioslave) if(BUILD_TESTING) diff -Nru kldap-17.12.3/debian/changelog kldap-18.04.1/debian/changelog --- kldap-17.12.3/debian/changelog 2018-03-12 21:24:42.000000000 +0000 +++ kldap-18.04.1/debian/changelog 2018-05-08 12:21:51.000000000 +0000 @@ -1,8 +1,17 @@ -kldap (17.12.3-0ubuntu1~ubuntu18.04~ppa2) bionic; urgency=high +kldap (18.04.1-0ubuntu1~ubuntu18.04~ppa1) bionic; urgency=medium + + * Update symbols + * New upstream release (18.03.80) + * New upstream release (18.04.0) + * New upstream release (18.04.1) + + -- Rik Mills Tue, 08 May 2018 13:21:51 +0100 + +kldap (17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) - -- Rik Mills Mon, 12 Mar 2018 21:24:42 +0000 + -- Rik Mills Fri, 16 Mar 2018 13:27:56 +0000 kldap (17.12.2-0ubuntu1) bionic; urgency=medium diff -Nru kldap-17.12.3/debian/control kldap-18.04.1/debian/control --- kldap-17.12.3/debian/control 2018-03-12 21:24:42.000000000 +0000 +++ kldap-18.04.1/debian/control 2018-05-08 12:21:51.000000000 +0000 @@ -10,7 +10,7 @@ libkf5doctools-dev (>= 5.31.0~), libkf5i18n-dev (>= 5.31.0~), libkf5kio-dev (>= 5.31.0~), - libkf5mbox-dev (>= 17.12.3~), + libkf5mbox-dev (>= 18.04.1~), libkf5widgetsaddons-dev (>= 5.31.0~), libldap2-dev, libsasl2-dev, diff -Nru kldap-17.12.3/debian/libkf5ldap5.symbols kldap-18.04.1/debian/libkf5ldap5.symbols --- kldap-17.12.3/debian/libkf5ldap5.symbols 2018-03-12 21:24:42.000000000 +0000 +++ kldap-18.04.1/debian/libkf5ldap5.symbols 2018-05-08 12:21:51.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 17.08.2+git20171029 amd64 +# SymbolsHelper-Confirmed: 18.03.70 amd64 libKF5Ldap.so.5 libkf5ldap5 #MINVER# _ZN5KLDAP10LdapObject13setAttributesERK4QMapI7QString5QListI10QByteArrayEE@Base 15.07.90 _ZN5KLDAP10LdapObject5clearEv@Base 15.07.90 @@ -12,7 +12,6 @@ _ZN5KLDAP10LdapObjectC2ERK7QString@Base 15.07.90 _ZN5KLDAP10LdapObjectC2ERKS0_@Base 15.07.90 _ZN5KLDAP10LdapObjectC2Ev@Base 15.07.90 - _ZN5KLDAP10LdapObjectD0Ev@Base 15.07.90 _ZN5KLDAP10LdapObjectD1Ev@Base 15.07.90 _ZN5KLDAP10LdapObjectD2Ev@Base 15.07.90 _ZN5KLDAP10LdapObjectaSERKS0_@Base 15.07.90 @@ -63,7 +62,6 @@ _ZN5KLDAP10LdapServerC2ERKNS_7LdapUrlE@Base 15.07.90 _ZN5KLDAP10LdapServerC2ERKS0_@Base 15.07.90 _ZN5KLDAP10LdapServerC2Ev@Base 15.07.90 - _ZN5KLDAP10LdapServerD0Ev@Base 15.07.90 _ZN5KLDAP10LdapServerD1Ev@Base 15.07.90 _ZN5KLDAP10LdapServerD2Ev@Base 15.07.90 _ZN5KLDAP10LdapServeraSERKS0_@Base 15.07.90 @@ -79,7 +77,6 @@ _ZN5KLDAP11LdapControlC2ERK7QStringRK10QByteArrayb@Base 15.07.90 _ZN5KLDAP11LdapControlC2ERKS0_@Base 15.07.90 _ZN5KLDAP11LdapControlC2Ev@Base 15.07.90 - _ZN5KLDAP11LdapControlD0Ev@Base 15.07.90 _ZN5KLDAP11LdapControlD1Ev@Base 15.07.90 _ZN5KLDAP11LdapControlD2Ev@Base 15.07.90 _ZN5KLDAP11LdapControlaSERKS0_@Base 15.07.90 @@ -110,7 +107,6 @@ _ZN5KLDAP13LdapOperationC1Ev@Base 15.07.90 _ZN5KLDAP13LdapOperationC2ERNS_14LdapConnectionE@Base 15.07.90 _ZN5KLDAP13LdapOperationC2Ev@Base 15.07.90 - _ZN5KLDAP13LdapOperationD0Ev@Base 15.07.90 _ZN5KLDAP13LdapOperationD1Ev@Base 15.07.90 _ZN5KLDAP13LdapOperationD2Ev@Base 15.07.90 _ZN5KLDAP14LdapConnection11errorStringEi@Base 15.07.90 @@ -127,7 +123,6 @@ _ZN5KLDAP14LdapConnectionC2ERKNS_10LdapServerE@Base 15.07.90 _ZN5KLDAP14LdapConnectionC2ERKNS_7LdapUrlE@Base 15.07.90 _ZN5KLDAP14LdapConnectionC2Ev@Base 15.07.90 - _ZN5KLDAP14LdapConnectionD0Ev@Base 15.07.90 _ZN5KLDAP14LdapConnectionD1Ev@Base 15.07.90 _ZN5KLDAP14LdapConnectionD2Ev@Base 15.07.90 _ZN5KLDAP16LdapConfigWidget10setVersionEi@Base 15.07.90 @@ -195,7 +190,6 @@ _ZN5KLDAP3BerC2ERK10QByteArray@Base 15.07.90 _ZN5KLDAP3BerC2ERKS0_@Base 15.07.90 _ZN5KLDAP3BerC2Ev@Base 15.07.90 - _ZN5KLDAP3BerD0Ev@Base 15.07.90 _ZN5KLDAP3BerD1Ev@Base 15.07.90 _ZN5KLDAP3BerD2Ev@Base 15.07.90 _ZN5KLDAP3BeraSERKS0_@Base 15.07.90 @@ -212,7 +206,6 @@ _ZN5KLDAP4LdifC1Ev@Base 15.07.90 _ZN5KLDAP4LdifC2ERKS0_@Base 15.07.90 _ZN5KLDAP4LdifC2Ev@Base 15.07.90 - _ZN5KLDAP4LdifD0Ev@Base 15.07.90 _ZN5KLDAP4LdifD1Ev@Base 15.07.90 _ZN5KLDAP4LdifD2Ev@Base 15.07.90 _ZN5KLDAP4LdifaSERKS0_@Base 15.07.90 @@ -242,7 +235,6 @@ _ZN5KLDAP7LdapUrlC2ERK4QUrl@Base 15.07.90 _ZN5KLDAP7LdapUrlC2ERKS0_@Base 15.07.90 _ZN5KLDAP7LdapUrlC2Ev@Base 15.07.90 - _ZN5KLDAP7LdapUrlD0Ev@Base 15.07.90 _ZN5KLDAP7LdapUrlD1Ev@Base 15.07.90 _ZN5KLDAP7LdapUrlD2Ev@Base 15.07.90 _ZN5KLDAP7LdapUrlaSERKS0_@Base 15.07.90 @@ -400,45 +392,19 @@ _ZNK5KLDAP9LdapModel6parentERK11QModelIndex@Base 15.07.90 _ZNK5KLDAP9LdapModel8mimeDataERK5QListI11QModelIndexE@Base 15.07.90 _ZNK5KLDAP9LdapModel8rowCountERK11QModelIndex@Base 15.07.90 - _ZTI4QUrl@Base 15.07.90 - _ZTIN5KLDAP10LdapObjectE@Base 15.07.90 _ZTIN5KLDAP10LdapSearchE@Base 15.07.90 - _ZTIN5KLDAP10LdapServerE@Base 15.07.90 - _ZTIN5KLDAP11LdapControlE@Base 15.07.90 - _ZTIN5KLDAP13LdapOperationE@Base 15.07.90 - _ZTIN5KLDAP14LdapConnectionE@Base 15.07.90 _ZTIN5KLDAP16LdapConfigWidgetE@Base 15.07.90 _ZTIN5KLDAP23LdapAttributeProxyModelE@Base 15.07.90 _ZTIN5KLDAP23LdapStructureProxyModelE@Base 15.07.90 - _ZTIN5KLDAP3BerE@Base 15.07.90 - _ZTIN5KLDAP4LdifE@Base 15.07.90 - _ZTIN5KLDAP7LdapUrlE@Base 15.07.90 _ZTIN5KLDAP9LdapModelE@Base 15.07.90 - _ZTS4QUrl@Base 15.07.90 - _ZTSN5KLDAP10LdapObjectE@Base 15.07.90 _ZTSN5KLDAP10LdapSearchE@Base 15.07.90 - _ZTSN5KLDAP10LdapServerE@Base 15.07.90 - _ZTSN5KLDAP11LdapControlE@Base 15.07.90 - _ZTSN5KLDAP13LdapOperationE@Base 15.07.90 - _ZTSN5KLDAP14LdapConnectionE@Base 15.07.90 _ZTSN5KLDAP16LdapConfigWidgetE@Base 15.07.90 _ZTSN5KLDAP23LdapAttributeProxyModelE@Base 15.07.90 _ZTSN5KLDAP23LdapStructureProxyModelE@Base 15.07.90 - _ZTSN5KLDAP3BerE@Base 15.07.90 - _ZTSN5KLDAP4LdifE@Base 15.07.90 - _ZTSN5KLDAP7LdapUrlE@Base 15.07.90 _ZTSN5KLDAP9LdapModelE@Base 15.07.90 - _ZTVN5KLDAP10LdapObjectE@Base 15.07.90 _ZTVN5KLDAP10LdapSearchE@Base 15.07.90 - _ZTVN5KLDAP10LdapServerE@Base 15.07.90 - _ZTVN5KLDAP11LdapControlE@Base 15.07.90 - _ZTVN5KLDAP13LdapOperationE@Base 15.07.90 - _ZTVN5KLDAP14LdapConnectionE@Base 15.07.90 _ZTVN5KLDAP16LdapConfigWidgetE@Base 15.07.90 _ZTVN5KLDAP23LdapAttributeProxyModelE@Base 15.07.90 _ZTVN5KLDAP23LdapStructureProxyModelE@Base 15.07.90 - _ZTVN5KLDAP3BerE@Base 15.07.90 - _ZTVN5KLDAP4LdifE@Base 15.07.90 - _ZTVN5KLDAP7LdapUrlE@Base 15.07.90 _ZTVN5KLDAP9LdapModelE@Base 15.07.90 (c++)"non-virtual thunk to KLDAP::LdapConfigWidget::~LdapConfigWidget()@Base" 15.07.90 diff -Nru kldap-17.12.3/KF5LdapConfig.cmake.in kldap-18.04.1/KF5LdapConfig.cmake.in --- kldap-17.12.3/KF5LdapConfig.cmake.in 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/KF5LdapConfig.cmake.in 2018-04-21 13:57:39.000000000 +0000 @@ -1,21 +1,3 @@ @PACKAGE_INIT@ -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_MODULE_PATH}) -include(CMakeFindDependencyMacro) -find_dependency(Ldap) -find_dependency(Sasl2) - -include(FeatureSummary) - -set_package_properties(Ldap PROPERTIES - DESCRIPTION "LDAP (Lightweight Directory Access Protocol) libraries" - URL "http://www.openldap.org" - PURPOSE "Needed to provide LDAP functionality in KDE" -) - -set_package_properties(Sasl2 PROPERTIES - DESCRIPTION "The Cyrus-sasl library" - URL "http://www.cyrussasl.org" -) - include("${CMAKE_CURRENT_LIST_DIR}/KF5LdapTargets.cmake") diff -Nru kldap-17.12.3/kioslave/.reviewboardrc kldap-18.04.1/kioslave/.reviewboardrc --- kldap-17.12.3/kioslave/.reviewboardrc 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/kioslave/.reviewboardrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org" -#REPOSITORY = "git://anongit.kde.org/kioslave" -BRANCH = "master" -TARGET_GROUPS = "kdepimlibs" -TARGET_PEOPLE = "mlaurent" diff -Nru kldap-17.12.3/kioslave/src/ldap/CMakeLists.txt kldap-18.04.1/kioslave/src/ldap/CMakeLists.txt --- kldap-17.12.3/kioslave/src/ldap/CMakeLists.txt 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/kioslave/src/ldap/CMakeLists.txt 2018-04-21 13:57:39.000000000 +0000 @@ -4,7 +4,7 @@ add_library(kio_ldap MODULE ${kio_ldap_PART_SRCS}) -target_link_libraries(kio_ldap KF5::KIOCore KF5::I18n KF5::Ldap) +target_link_libraries(kio_ldap Qt5::Network KF5::KIOCore KF5::I18n KF5::Ldap) if (WIN32) target_link_libraries(kio_ldap ws2_32) endif() diff -Nru kldap-17.12.3/kioslave/src/ldap/kio_ldap.h kldap-18.04.1/kioslave/src/ldap/kio_ldap.h --- kldap-17.12.3/kioslave/src/ldap/kio_ldap.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/kioslave/src/ldap/kio_ldap.h 2018-04-21 13:57:39.000000000 +0000 @@ -36,9 +36,9 @@ { public: LDAPProtocol(const QByteArray &protocol, const QByteArray &pool, const QByteArray &app); - virtual ~LDAPProtocol(); + ~LDAPProtocol() override; - virtual void setHost(const QString &host, quint16 port, + void setHost(const QString &host, quint16 port, const QString &user, const QString &pass) override; void openConnection() override; diff -Nru kldap-17.12.3/kldap.renamecategories kldap-18.04.1/kldap.renamecategories --- kldap-17.12.3/kldap.renamecategories 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/kldap.renamecategories 2018-04-21 13:57:39.000000000 +0000 @@ -1 +1,2 @@ log_kldap org.kde.pim.kldap +log_ldap org.kde.pim.ldap diff -Nru kldap-17.12.3/po/ar/libkldap5.po kldap-18.04.1/po/ar/libkldap5.po --- kldap-17.12.3/po/ar/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/ar/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2007-10-14 15:58+0000\n" "Last-Translator: Youssef Chahibi \n" "Language-Team: \n" @@ -251,7 +251,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "LDAP دعم ليس بوصة رجاء مع أو متوافق عميل أو إلى التوزيعة." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/ast/libkldap5.po kldap-18.04.1/po/ast/libkldap5.po --- kldap-17.12.3/po/ast/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/ast/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2016-12-19 03:03+0100\n" "Last-Translator: enolp \n" "Language-Team: Asturian \n" @@ -238,7 +238,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/bs/libkldap5.po kldap-18.04.1/po/bs/libkldap5.po --- kldap-17.12.3/po/bs/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/bs/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdepimlibs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2012-09-03 15:44+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Bosnian \n" @@ -248,7 +248,7 @@ "koristeći OpenLDAP (ili kompatibilnu) klijent biblioteku ili se obratite " "izdavaču distribucije." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Ne mogu pristupiti serveru. Molimo podesite." diff -Nru kldap-17.12.3/po/ca/libkldap5.po kldap-18.04.1/po/ca/libkldap5.po --- kldap-17.12.3/po/ca/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/ca/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libkldap5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-04 11:20+0100\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" @@ -251,7 +251,7 @@ "amb les biblioteques del client OpenLDAP (o compatible), o reclameu als " "empaquetadors de la vostra distribució." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "No s'ha pogut accedir al servidor. Si us plau, torneu a configurar-lo." @@ -260,3 +260,6 @@ #, kde-format msgid "Distinguished Name" msgstr "Nom distintiu" + +#~ msgid "LDAP Operations error" +#~ msgstr "Error d'operacions del LDAP" diff -Nru kldap-17.12.3/po/ca@valencia/libkldap5.po kldap-18.04.1/po/ca@valencia/libkldap5.po --- kldap-17.12.3/po/ca@valencia/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/ca@valencia/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libkldap5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-04 11:20+0100\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" @@ -251,7 +251,7 @@ "amb les biblioteques del client OpenLDAP (o compatible), o reclameu als " "empaquetadors de la vostra distribució." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "No s'ha pogut accedir al servidor. Per favor, torneu a configurar-lo." @@ -260,3 +260,6 @@ #, kde-format msgid "Distinguished Name" msgstr "Nom distintiu" + +#~ msgid "LDAP Operations error" +#~ msgstr "Error d'operacions del LDAP" diff -Nru kldap-17.12.3/po/cs/libkldap5.po kldap-18.04.1/po/cs/libkldap5.po --- kldap-17.12.3/po/cs/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/cs/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-11-14 14:58+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" @@ -246,7 +246,7 @@ "klientskými knihovnami OpenLDAP (nebo kompatibilními) nebo si stěžujte " "tvůrcům balíčků své distribuce." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Nelze se připojit na server, prosím nastavte jej znovu." diff -Nru kldap-17.12.3/po/da/libkldap5.po kldap-18.04.1/po/da/libkldap5.po --- kldap-17.12.3/po/da/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/da/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2014-07-23 21:07+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -245,7 +245,7 @@ "OpenLDAP (eller kompatible) klientbiblioteker, eller klag til de " "pakkeansvarlige hos din distribution." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Kan ikke tilgå serveren. Omkonfigurér den." diff -Nru kldap-17.12.3/po/de/libkldap5.po kldap-18.04.1/po/de/libkldap5.po --- kldap-17.12.3/po/de/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/de/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-11-21 07:04+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" @@ -247,7 +247,7 @@ "kompatiblen) oder erkundigen Sie sich beim Ersteller der installierten " "Pakete." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/el/libkldap5.po kldap-18.04.1/po/el/libkldap5.po --- kldap-17.12.3/po/el/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/el/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2014-11-14 19:00+0200\n" "Last-Translator: Dimitris Kardarakos \n" "Language-Team: Greek \n" @@ -245,7 +245,7 @@ "Δεν υπάρχει υποστήριξη LDAP. Παρακαλώ κάντε compile το libkldap με τις " "βιβλιοθήκες OpenLDAP (ή συμβατές), ή ενημερώστε τη διανομή σας." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/en_GB/libkldap5.po kldap-18.04.1/po/en_GB/libkldap5.po --- kldap-17.12.3/po/en_GB/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/en_GB/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" -"PO-Revision-Date: 2017-11-26 21:09+0000\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" +"PO-Revision-Date: 2017-11-26 13:58+0000\n" "Last-Translator: Steve Allewell \n" "Language-Team: British English \n" "Language: en_GB\n" @@ -242,7 +242,7 @@ "LDAP support not compiled in. Please recompile libkldap with the OpenLDAP " "(or compatible) client libraries, or complain to your distribution packagers." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Cannot access to server. Please reconfigure it." diff -Nru kldap-17.12.3/po/eo/libkldap5.po kldap-18.04.1/po/eo/libkldap5.po --- kldap-17.12.3/po/eo/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/eo/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2009-11-15 12:06+0100\n" "Last-Translator: Axel Rousseau \n" "Language-Team: esperanto \n" @@ -237,7 +237,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/es/libkldap5.po kldap-18.04.1/po/es/libkldap5.po --- kldap-17.12.3/po/es/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/es/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-22 22:59+0100\n" "Last-Translator: Javier Vinal \n" "Language-Team: Spanish \n" @@ -250,7 +250,7 @@ "libkldap con las bibliotecas cliente de OpenLDAP (o compatible), o consulte " "a los empaquetadores de su distribución." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "No se puede acceder al servidor. Por favor, reconfigúrelo." diff -Nru kldap-17.12.3/po/et/libkldap5.po kldap-18.04.1/po/et/libkldap5.po --- kldap-17.12.3/po/et/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/et/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2014-07-18 18:36+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -245,7 +245,7 @@ "sellega ühilduva kliendi teekidega või kurda muret oma distributsiooni " "pakendajatele." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Ligipääs serverile puudub. Palun muuda seadistusi." diff -Nru kldap-17.12.3/po/fi/libkldap5.po kldap-18.04.1/po/fi/libkldap5.po --- kldap-17.12.3/po/fi/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/fi/libkldap5.po 2018-05-08 00:21:02.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-12-25 20:33+0200\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" @@ -246,7 +246,7 @@ "LDAP-tukea ei ole käännetty. Käännä libkldap uudelleen OpenLDAP- tai " "yhteensopivalla asiakaskirjastolla tai valita jakelusi paketoijille." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Palvelimeen ei saa yhteyttä: määritä sen asetukset uudelleen." diff -Nru kldap-17.12.3/po/fr/libkldap5.po kldap-18.04.1/po/fr/libkldap5.po --- kldap-17.12.3/po/fr/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/fr/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2018-01-11 20:56+0100\n" "Last-Translator: Vincent Pinon \n" "Language-Team: French \n" @@ -255,7 +255,7 @@ "compatible) ou reporter ce souci aux responsables de paquets de votre " "distribution." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Impossible d'accéder au serveur. Veuillez le reconfigurer." diff -Nru kldap-17.12.3/po/ga/libkldap5.po kldap-18.04.1/po/ga/libkldap5.po --- kldap-17.12.3/po/ga/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/ga/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2007-04-15 19:05-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -249,7 +249,7 @@ "leabharlanna cliaint OpenLDAP (nó ceann comhoiriúnach), nó gearán a dhéanamh " "le pacáisteoirí do dháileadh." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Ní féidir an freastalaí a rochtain. Cumraigh é arís." diff -Nru kldap-17.12.3/po/gl/kio_ldap.po kldap-18.04.1/po/gl/kio_ldap.po --- kldap-17.12.3/po/gl/kio_ldap.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/gl/kio_ldap.po 2018-05-08 00:21:03.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # mvillarino , 2007, 2008. -# Adrián Chaves (Gallaecio) , 2017. +# Adrián Chaves (Gallaecio) , 2017, 2018. msgid "" msgstr "" "Project-Id-Version: kio_ldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-07-24 03:15+0200\n" -"PO-Revision-Date: 2017-09-09 12:23+0100\n" -"Last-Translator: Adrián Chaves (Gallaecio) \n" +"PO-Revision-Date: 2018-04-28 20:43+0100\n" +"Last-Translator: Adrian Chaves \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ #: kio_ldap.cpp:369 #, kde-format msgid "LDAP connection canceled." -msgstr "A conexión LDAP foi cancelada." +msgstr "Cancelouse a conexión LDAP." #: kio_ldap.cpp:633 kio_ldap.cpp:704 #, kde-format diff -Nru kldap-17.12.3/po/gl/libkldap5.po kldap-18.04.1/po/gl/libkldap5.po --- kldap-17.12.3/po/gl/libkldap5.po 2018-03-06 00:27:40.000000000 +0000 +++ kldap-18.04.1/po/gl/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -5,14 +5,14 @@ # mvillarino , 2007, 2008. # marce villarino , 2009. # Adrián Chaves Fernández , 2015, 2017. -# Adrián Chaves (Gallaecio) , 2017. +# Adrián Chaves (Gallaecio) , 2017, 2018. msgid "" msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" -"PO-Revision-Date: 2017-11-05 15:04+0100\n" -"Last-Translator: Adrián Chaves (Gallaecio) \n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" +"PO-Revision-Date: 2018-04-20 18:56+0100\n" +"Last-Translator: Adrian Chaves \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -177,7 +177,7 @@ #: ldapconfigwidget.cpp:355 #, kde-format msgid "Check server" -msgstr "" +msgstr "Comprobar o servidor" #: ldapconfigwidget.cpp:361 #, kde-format @@ -213,14 +213,14 @@ #: ldapconnection.cpp:277 #, kde-format msgid "Cannot set protocol version to %1." -msgstr "Non é posíbel estabelecer a versión do protocolo como %1." +msgstr "Non se pode estabelecer a versión do protocolo como %1." #: ldapconnection.cpp:288 #, kde-format msgid "Cannot set timeout to %1 second." msgid_plural "Cannot set timeout to %1 seconds." -msgstr[0] "Non é posíbel estabelecer o límite de tempo en %1 segundo." -msgstr[1] "Non é posíbel estabelecer o límite de tempo en %1 segundos." +msgstr[0] "Non se pode estabelecer o límite de tempo en %1 segundo." +msgstr[1] "Non se pode estabelecer o límite de tempo en %1 segundos." #: ldapconnection.cpp:309 #, kde-format @@ -230,17 +230,17 @@ #: ldapconnection.cpp:319 #, kde-format msgid "Cannot set size limit." -msgstr "Non é posíbel estabelecer o límite de tamaño." +msgstr "Non se pode estabelecer o límite de tamaño." #: ldapconnection.cpp:329 #, kde-format msgid "Cannot set time limit." -msgstr "Non é posíbel estabelecer o límite de tempo." +msgstr "Non se pode estabelecer o límite de tempo." #: ldapconnection.cpp:339 #, kde-format msgid "Cannot initialize the SASL client." -msgstr "Non foi posíbel inicializar o cliente de SASL." +msgstr "Non se pode inicializar o cliente de SASL." #: ldapconnection.cpp:418 #, kde-format @@ -252,10 +252,10 @@ "libkldap coas bibliotecas cliente de OpenLDAP (ou compatíbeis), ou " "protéstalle aos empaquetadores da túa distribución." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." -msgstr "Non é posíbel acceder ao servidor. Por favor, reconfigúreo." +msgstr "Non se pode acceder ao servidor. Por favor, reconfigúreo." #: ldapstructureproxymodel.cpp:74 #, kde-format diff -Nru kldap-17.12.3/po/hi/libkldap5.po kldap-18.04.1/po/hi/libkldap5.po --- kldap-17.12.3/po/hi/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/hi/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2008-01-28 12:57+0530\n" "Last-Translator: Ravishankar Shrivastava \n" "Language-Team: Hindi \n" @@ -249,7 +249,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/hu/libkldap5.po kldap-18.04.1/po/hu/libkldap5.po --- kldap-17.12.3/po/hu/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/hu/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: KDE 4.3\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2014-06-14 15:51+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -245,7 +245,7 @@ "(vagy ezzel kompatibilis más) kliens programkönyvtárral, vagy kérjen " "segítséget a disztribúció csomagkészítőitől." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/ia/libkldap5.po kldap-18.04.1/po/ia/libkldap5.po --- kldap-17.12.3/po/ia/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/ia/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2012-07-27 12:06+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua \n" @@ -244,7 +244,7 @@ "con le librerias cliente OpenLDAP (o compatibile), o querela tu " "impacchettator de distribution." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Non pote acceder a servitor. Pro favor tu reconfigura lo." diff -Nru kldap-17.12.3/po/it/libkldap5.po kldap-18.04.1/po/it/libkldap5.po --- kldap-17.12.3/po/it/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/it/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -2,13 +2,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Federico Zenith , 2007. -# Luigi Toscano , 2014, 2017. +# Luigi Toscano , 2014, 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-05 23:57+0100\n" "Last-Translator: Luigi Toscano \n" "Language-Team: Italian \n" @@ -248,7 +248,7 @@ "OpenLDAP (o compatibili), o segnala il problema ai responsabili del " "pacchetto della tua distribuzione." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/ja/libkldap5.po kldap-18.04.1/po/ja/libkldap5.po --- kldap-17.12.3/po/ja/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/ja/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2010-01-27 01:06+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" @@ -245,7 +245,7 @@ "ライブラリ付きで libkldap をコンパイルし直すか、お使いのディストリビューショ" "ンのパッケージ作成者に問題を報告してください。" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "サーバにアクセスできません。設定をやり直してください。" diff -Nru kldap-17.12.3/po/kk/libkldap5.po kldap-18.04.1/po/kk/libkldap5.po --- kldap-17.12.3/po/kk/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/kk/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2012-02-29 03:21+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" @@ -243,7 +243,7 @@ "клиенттік жинақ файлдарымен бірге қайта компиляциялап жинқтаңыз, не " "дистрибутивіңіздің жабдықтаушыңызға шағымданыңыз." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Серверімен қатынас жоқ. Оны қайта баптап көріңіз." diff -Nru kldap-17.12.3/po/km/libkldap5.po kldap-18.04.1/po/km/libkldap5.po --- kldap-17.12.3/po/km/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/km/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2010-12-13 09:23+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -243,7 +243,7 @@ "ការ​គាំទ្រ LDAP មិន​បាន​ចងក្រង​នៅ ។ សូម​ចងក្រង​ libkldap ដោយ​បណ្ណាល័យ​ម៉ាស៊ីន​ភ្ញៀវ OpenLDAP (ឬ​" "ឆបគ្នា) ឬ​តវ៉ា​ទៅ​​អ្នកគ្រប់គ្រង​កញ្ចប់​ចែកចាយ​របស់​អ្នក ។" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "មិន​អាច​ចូលដំណើរការ​ទៅកាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។ សូម​កំណត់​រចនាសម្ព័ន្ធ​វា​ម្ដង​ទៀត ។" diff -Nru kldap-17.12.3/po/ko/libkldap5.po kldap-18.04.1/po/ko/libkldap5.po --- kldap-17.12.3/po/ko/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/ko/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-12-03 22:14+0100\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" @@ -241,7 +241,7 @@ "LDAP 지원을 사용할 수 없습니다 libkldap을 OpenLDAP 및 호환되는 클라이언트 라" "이브러리와 함께 컴파일하거나, 배포판 패키지 관리자에게 문의하십시오." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "서버에 접근할 수 없습니다. 다시 설정하십시오." diff -Nru kldap-17.12.3/po/lt/libkldap5.po kldap-18.04.1/po/lt/libkldap5.po --- kldap-17.12.3/po/lt/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/lt/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2011-09-25 13:12+0300\n" "Last-Translator: Remigijus Jarmalavičius \n" "Language-Team: Lithuanian \n" @@ -241,7 +241,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/lv/libkldap5.po kldap-18.04.1/po/lv/libkldap5.po --- kldap-17.12.3/po/lv/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/lv/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2009-06-01 20:03+0300\n" "Last-Translator: Viesturs Zariņš \n" "Language-Team: Latvian \n" @@ -248,7 +248,7 @@ "savietojamu) klienta bibliotēku, vai sūdzieties jūsu distribūcijas " "pakotājiem." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Neizdevās piekļūt serverim. Lūdzu konfigurējiet to." diff -Nru kldap-17.12.3/po/mr/libkldap5.po kldap-18.04.1/po/mr/libkldap5.po --- kldap-17.12.3/po/mr/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/mr/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2013-03-13 15:17+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" @@ -238,7 +238,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/nb/libkldap5.po kldap-18.04.1/po/nb/libkldap5.po --- kldap-17.12.3/po/nb/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/nb/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2014-09-23 22:05+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -246,7 +246,7 @@ "fra OpenLDAP (eller kompatible), eller klag til den som pakker " "distribusjonen." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Får ikke tilgang til tjeneren. Endre oppsettet på den." diff -Nru kldap-17.12.3/po/nds/libkldap5.po kldap-18.04.1/po/nds/libkldap5.po --- kldap-17.12.3/po/nds/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/nds/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2014-06-05 16:27+0200\n" "Last-Translator: Sönke Dibbern \n" "Language-Team: Low Saxon \n" @@ -247,7 +247,7 @@ "de Client-Bibliotheken vun OpenLDAP (oder mit anner, kompatibel " "Bibliotheken), oder snack dor de Paketmakers vun Dien Distributschoon op an." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Keen Togriep op Server. Bitte nieg instellen." diff -Nru kldap-17.12.3/po/nl/libkldap5.po kldap-18.04.1/po/nl/libkldap5.po --- kldap-17.12.3/po/nl/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/nl/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-04 12:27+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -249,7 +249,7 @@ "de OpenLDAP clientbibliotheken (of die daarmee compatibel zijn), of meld dit " "aan uw distributie." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Kan de server niet benaderen. Doe een herconfiguratie." diff -Nru kldap-17.12.3/po/nn/libkldap5.po kldap-18.04.1/po/nn/libkldap5.po --- kldap-17.12.3/po/nn/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/nn/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2010-04-20 22:07+0200\n" "Last-Translator: Eirik U. Birkeland \n" "Language-Team: Norwegian Nynorsk \n" @@ -247,7 +247,7 @@ "klientbiblioteka OpenLDAP (eller tilsvarande), eller klag til dei som har " "pakka distribusjonen." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Får ikkje tilgang til tenaren. Prøv å setja han opp på nytt." diff -Nru kldap-17.12.3/po/pa/libkldap5.po kldap-18.04.1/po/pa/libkldap5.po --- kldap-17.12.3/po/pa/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/pa/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2009-01-20 09:03+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi \n" @@ -240,7 +240,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/pl/libkldap5.po kldap-18.04.1/po/pl/libkldap5.po --- kldap-17.12.3/po/pl/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/pl/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-22 05:53+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -246,7 +246,7 @@ "bibliotekami klienta OpenLDAP (lub zgodnymi) lub zgłosić problem autorom " "swojej dystrybucji." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Nie można uzyskać dostępu do serwera. Proszę ustawić go ponownie." diff -Nru kldap-17.12.3/po/pt/libkldap5.po kldap-18.04.1/po/pt/libkldap5.po --- kldap-17.12.3/po/pt/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/pt/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-04 10:14+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -245,7 +245,7 @@ "libkldap com as bibliotecas-clientes do OpenLDAP (ou compatível), ou peça-o " "aos criadores de pacotes da sua distribuição." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Não é possível aceder ao servidor. Reconfigure-o, por favor." diff -Nru kldap-17.12.3/po/pt_BR/libkldap5.po kldap-18.04.1/po/pt_BR/libkldap5.po --- kldap-17.12.3/po/pt_BR/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/pt_BR/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkldap5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2014-08-19 23:16-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" @@ -247,7 +247,7 @@ "libkldap com as bibliotecas do cliente OpenLDAP (ou compatível), ou solicite " "aos criadores dos pacotes da sua distribuição." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Não foi possível acessar o servidor. Reconfigure-o." diff -Nru kldap-17.12.3/po/ro/libkldap5.po kldap-18.04.1/po/ro/libkldap5.po --- kldap-17.12.3/po/ro/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/ro/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2009-01-05 10:56+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -244,7 +244,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/ru/libkldap5.po kldap-18.04.1/po/ru/libkldap5.po --- kldap-17.12.3/po/ru/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/ru/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: kdelibs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2014-08-14 13:57+0400\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" @@ -257,7 +257,7 @@ "Нет поддержки LDAP. Соберите libkldap с библиотеками клиента OpenLDAP (или " "совместимыми) или попросите сделать это поставщика вашего дистрибутива." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Не удалось получить доступ к серверу, настройте его." diff -Nru kldap-17.12.3/po/sk/libkldap5.po kldap-18.04.1/po/sk/libkldap5.po --- kldap-17.12.3/po/sk/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/sk/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libkldap5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-11-01 11:10+0100\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" @@ -243,7 +243,7 @@ "(alebo kompatibilnými) klientskými knižnicami, alebo to ohláste baličom " "vašej distribúcie." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Nemôžem pristupovať na server. Prosím, prekonfigurujte ho." diff -Nru kldap-17.12.3/po/sl/libkldap5.po kldap-18.04.1/po/sl/libkldap5.po --- kldap-17.12.3/po/sl/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/sl/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2018-01-18 17:56+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -250,7 +250,7 @@ "distribucijo ali znova prevedite izvorno kodo libkldap s knjižnicami " "odjemalca OpenLDAP (ali združljivimi)." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Do strežnika ni mogoče dostopati. Preverite nastavitve." diff -Nru kldap-17.12.3/po/sr/libkldap5.po kldap-18.04.1/po/sr/libkldap5.po --- kldap-17.12.3/po/sr/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/sr/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libkldap5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-06 17:14+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -258,7 +258,7 @@ "библиотекама ОпенЛДАП‑а (или сагласним), или се пожалите пакетарима своје " "дистрибуције." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Не могу да приступим серверу. Подесите га поново." diff -Nru kldap-17.12.3/po/sv/docs/kioslave5/ldap/index.docbook kldap-18.04.1/po/sv/docs/kioslave5/ldap/index.docbook --- kldap-17.12.3/po/sv/docs/kioslave5/ldap/index.docbook 2018-03-06 00:27:42.000000000 +0000 +++ kldap-18.04.1/po/sv/docs/kioslave5/ldap/index.docbook 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ - - - -]> - -
-ldap - - -&Lauri.Watts; &Lauri.Watts.mail; - Stefan Asserhäll
stefan.asserhall@bredband.net
 Översättare - - - -ldap är det lättviktiga katalogåtkomstprotokollet. Det ger möjlighet att komma åt en X.500-katalog, eller en ensam LDAP-server. - -Du kan använda I/O-slaven ldap som följer: - -ldap://värddator:port/ou=People,o=where,c=de??sub får en delträdsförfrågan - -eller ldap://värddator:port/cn=MM,ou=People,o=where,c=de??bas får en fullständig gren. - -
diff -Nru kldap-17.12.3/po/sv/libkldap5.po kldap-18.04.1/po/sv/libkldap5.po --- kldap-17.12.3/po/sv/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/sv/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-04 18:29+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -245,7 +245,7 @@ "OpenLDAP (eller motsvarande), eller klaga hos din distributions " "paketansvariga." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Kan inte komma åt servern. Ändra dess inställning." diff -Nru kldap-17.12.3/po/tr/libkldap5.po kldap-18.04.1/po/tr/libkldap5.po --- kldap-17.12.3/po/tr/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/tr/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-23 09:33+0000\n" "Last-Translator: Kaan \n" "Language-Team: Turkish \n" @@ -247,7 +247,7 @@ "uyumlu bir uygulama) istemci kitaplıkları ile yeniden derleyin ya da " "kullandığınız dağıtımın paketçilerine başvurun." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "Sunucuya erişilemedi. Lütfen yeniden yapılandırın." diff -Nru kldap-17.12.3/po/ug/libkldap5.po kldap-18.04.1/po/ug/libkldap5.po --- kldap-17.12.3/po/ug/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/ug/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" @@ -237,7 +237,7 @@ "(or compatible) client libraries, or complain to your distribution packagers." msgstr "" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/uk/libkldap5.po kldap-18.04.1/po/uk/libkldap5.po --- kldap-17.12.3/po/uk/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/uk/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkldap5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2017-10-05 20:29+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -250,7 +250,7 @@ "клієнтськими бібліотеками OpenLDAP (або сумісними з ними), або надішліть " "скаргу особі, що готувала пакунок вашого дистрибутива." -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "" diff -Nru kldap-17.12.3/po/zh_CN/kio_ldap.po kldap-18.04.1/po/zh_CN/kio_ldap.po --- kldap-17.12.3/po/zh_CN/kio_ldap.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/zh_CN/kio_ldap.po 2018-05-08 00:21:03.000000000 +0000 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-07-24 03:15+0200\n" -"PO-Revision-Date: 2018-02-28 02:27-0500\n" +"PO-Revision-Date: 2018-04-26 06:08-0400\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru kldap-17.12.3/po/zh_CN/libkldap5.po kldap-18.04.1/po/zh_CN/libkldap5.po --- kldap-17.12.3/po/zh_CN/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/zh_CN/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" -"PO-Revision-Date: 2018-02-28 02:28-0500\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" +"PO-Revision-Date: 2018-04-26 06:08-0400\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -244,7 +244,7 @@ "未编译 LDAP 支持。请在 OpenLDAP 客户端库或兼容环境下重新编译 libkldap，或向您" "所用发行版的打包人员申诉。" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "无法访问服务器，请重新配置。" diff -Nru kldap-17.12.3/po/zh_TW/libkldap5.po kldap-18.04.1/po/zh_TW/libkldap5.po --- kldap-17.12.3/po/zh_TW/libkldap5.po 2018-03-06 00:27:41.000000000 +0000 +++ kldap-18.04.1/po/zh_TW/libkldap5.po 2018-05-08 00:21:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkldap\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-04 06:49+0200\n" +"POT-Creation-Date: 2018-02-14 03:19+0100\n" "PO-Revision-Date: 2015-02-20 23:01+0800\n" "Last-Translator: Franklin Weng \n" "Language-Team: Chinese Traditional \n" @@ -244,7 +244,7 @@ "未將 LDAP 支援編譯進來。請重新編譯 libkldap，加入 OpenLDAP 或相容的客戶端函式" "庫，或是向您的套件提供商反應。" -#: ldapsearch.cpp:238 +#: ldapsearch.cpp:239 #, kde-format msgid "Cannot access to server. Please reconfigure it." msgstr "無法存取伺服器。請重新設定。" diff -Nru kldap-17.12.3/src/ber.h kldap-18.04.1/src/ber.h --- kldap-17.12.3/src/ber.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ber.h 2018-04-21 13:57:39.000000000 +0000 @@ -48,7 +48,7 @@ /** * Destroys the Ber object. */ - virtual ~Ber(); + ~Ber(); Ber(const Ber &that); Ber &operator=(const Ber &that); diff -Nru kldap-17.12.3/src/CMakeLists.txt kldap-18.04.1/src/CMakeLists.txt --- kldap-17.12.3/src/CMakeLists.txt 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/CMakeLists.txt 2018-04-21 13:57:39.000000000 +0000 @@ -7,13 +7,13 @@ set(kldap_EXTRA_LIBS) if(Ldap_FOUND) - set(kldap_EXTRA_LIBS ${Ldap_LIBRARIES}) + set(kldap_EXTRA_LIBS Ldap::Ldap) if(WIN32) set(kldap_EXTRA_LIBS ${kldap_EXTRA_LIBS} ws2_32) endif() set(HAVE_LDAP_H) set(CMAKE_REQUIRED_INCLUDES lber.h ldap.h) - set(CMAKE_REQUIRED_LIBRARIES ${Ldap_LIBRARIES}) + set(CMAKE_REQUIRED_LIBRARIES Ldap::Ldap) check_function_exists(ldap_start_tls_s HAVE_LDAP_START_TLS_S) check_function_exists(ldap_initialize HAVE_LDAP_INITIALIZE) check_function_exists(ber_memfree HAVE_BER_MEMFREE) @@ -25,7 +25,7 @@ endif() if(Sasl2_FOUND) - set(kldap_EXTRA_LIBS ${kldap_EXTRA_LIBS} ${Sasl2_LIBRARIES}) + set(kldap_EXTRA_LIBS ${kldap_EXTRA_LIBS} Sasl2::Sasl2) endif() configure_file(kldap_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kldap_config.h) @@ -67,13 +67,8 @@ ${kldap_EXTRA_LIBS} ) -target_include_directories(KF5Ldap INTERFACE "$") -target_include_directories(KF5Ldap PUBLIC "$") - -if(Sasl2_FOUND) - target_include_directories(KF5Ldap INTERFACE "$") - target_include_directories(KF5Ldap PUBLIC "$") -endif() +target_include_directories(KF5Ldap INTERFACE "$") +target_include_directories(KF5Ldap PUBLIC "$") set_target_properties(KF5Ldap PROPERTIES VERSION ${KLDAP_VERSION_STRING} @@ -81,7 +76,6 @@ EXPORT_NAME Ldap ) - install(TARGETS KF5Ldap EXPORT KF5LdapTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### diff -Nru kldap-17.12.3/src/ldapattributeproxymodel.h kldap-18.04.1/src/ldapattributeproxymodel.h --- kldap-17.12.3/src/ldapattributeproxymodel.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapattributeproxymodel.h 2018-04-21 13:57:39.000000000 +0000 @@ -33,7 +33,7 @@ Q_OBJECT public: explicit LdapAttributeProxyModel(QObject *parent = nullptr); - ~LdapAttributeProxyModel(); + ~LdapAttributeProxyModel() override; QVariant data(const QModelIndex &index, int role) const override; /** diff -Nru kldap-17.12.3/src/ldapconfigwidget.h kldap-18.04.1/src/ldapconfigwidget.h --- kldap-17.12.3/src/ldapconfigwidget.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapconfigwidget.h 2018-04-21 13:57:39.000000000 +0000 @@ -104,7 +104,7 @@ explicit LdapConfigWidget(WinFlags flags, QWidget *parent = nullptr, Qt::WindowFlags fl = 0); /** Destructs a configuration widget */ - virtual ~LdapConfigWidget(); + ~LdapConfigWidget(); /** Sets the user name. Kconfig widget name: kcfg_ldapuser * @param user the user name to set diff -Nru kldap-17.12.3/src/ldapconnection.h kldap-18.04.1/src/ldapconnection.h --- kldap-17.12.3/src/ldapconnection.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapconnection.h 2018-04-21 13:57:39.000000000 +0000 @@ -52,7 +52,7 @@ /** Constructs an LdapConnection with the parameters given in server */ explicit LdapConnection(const LdapServer &server); - virtual ~LdapConnection(); + ~LdapConnection(); /** * Sets the connection parameters via the specified url. After this, diff -Nru kldap-17.12.3/src/ldapcontrol.h kldap-18.04.1/src/ldapcontrol.h --- kldap-17.12.3/src/ldapcontrol.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapcontrol.h 2018-04-21 13:57:39.000000000 +0000 @@ -57,7 +57,7 @@ /** * Destroys the control object. */ - virtual ~LdapControl(); + ~LdapControl(); /** * Sets the control's OID, value and criticality. */ diff -Nru kldap-17.12.3/src/ldapmodel.h kldap-18.04.1/src/ldapmodel.h --- kldap-17.12.3/src/ldapmodel.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapmodel.h 2018-04-21 13:57:39.000000000 +0000 @@ -71,7 +71,7 @@ * \see ready() */ explicit LdapModel(LdapConnection &connection, QObject *parent = nullptr); - virtual ~LdapModel(); + ~LdapModel() override; /** * Set the connection that the model should use. diff -Nru kldap-17.12.3/src/ldapmodelnode_p.h kldap-18.04.1/src/ldapmodelnode_p.h --- kldap-17.12.3/src/ldapmodelnode_p.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapmodelnode_p.h 2018-04-21 13:57:39.000000000 +0000 @@ -81,7 +81,7 @@ public: explicit LdapModelDNNode(LdapModelDNNode *parent = nullptr, const LdapDN &dn = LdapDN()); - ~LdapModelDNNode(); + ~LdapModelDNNode() override; LdapModelNode::NodeType nodeType() const override { @@ -126,7 +126,7 @@ explicit LdapModelAttrNode(LdapModelDNNode *parent = nullptr, const QString &attrName = QString(), const QByteArray &attrData = QByteArray()); - ~LdapModelAttrNode(); + ~LdapModelAttrNode() override; LdapModelNode::NodeType nodeType() const override { diff -Nru kldap-17.12.3/src/ldapobject.h kldap-18.04.1/src/ldapobject.h --- kldap-17.12.3/src/ldapobject.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapobject.h 2018-04-21 13:57:39.000000000 +0000 @@ -47,7 +47,7 @@ public: LdapObject(); explicit LdapObject(const QString &dn); - virtual ~LdapObject(); + ~LdapObject(); LdapObject(const LdapObject &that); LdapObject &operator=(const LdapObject &that); diff -Nru kldap-17.12.3/src/ldapoperation.h kldap-18.04.1/src/ldapoperation.h --- kldap-17.12.3/src/ldapoperation.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapoperation.h 2018-04-21 13:57:39.000000000 +0000 @@ -95,7 +95,7 @@ LdapOperation(); LdapOperation(LdapConnection &conn); - virtual ~LdapOperation(); + ~LdapOperation(); /** * Sets the connection object. Without living connection object, diff -Nru kldap-17.12.3/src/ldapsearch.cpp kldap-18.04.1/src/ldapsearch.cpp --- kldap-17.12.3/src/ldapsearch.cpp 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapsearch.cpp 2018-04-21 13:57:39.000000000 +0000 @@ -52,7 +52,8 @@ LdapOperation mOp; bool mOwnConnection = false; bool mAbandoned = false; - int mId, mPageSize; + int mId; + int mPageSize; LdapDN mBase; QString mFilter; QStringList mAttributes; @@ -202,7 +203,7 @@ const QString &filter, const QStringList &attributes, int pagesize, int count) { - qCDebug(LDAP_LOG) << "search: base=" << base.toString() << "scope=" << (int)scope + qCDebug(LDAP_LOG) << "search: base=" << base.toString() << "scope=" << static_cast(scope) << "filter=" << filter << "attributes=" << attributes << "pagesize=" << pagesize; mAbandoned = false; diff -Nru kldap-17.12.3/src/ldapsearch.h kldap-18.04.1/src/ldapsearch.h --- kldap-17.12.3/src/ldapsearch.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapsearch.h 2018-04-21 13:57:39.000000000 +0000 @@ -62,7 +62,7 @@ */ explicit LdapSearch(LdapConnection &connection); - virtual ~LdapSearch(); + ~LdapSearch(); /** * Sets the connection for this object to use for searches from now diff -Nru kldap-17.12.3/src/ldapserver.h kldap-18.04.1/src/ldapserver.h --- kldap-17.12.3/src/ldapserver.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapserver.h 2018-04-21 13:57:39.000000000 +0000 @@ -67,7 +67,7 @@ /** * Destroys the LDAP server object. */ - virtual ~LdapServer(); + ~LdapServer(); /** * Describes the encryption settings that can be used diff -Nru kldap-17.12.3/src/ldapstructureproxymodel.h kldap-18.04.1/src/ldapstructureproxymodel.h --- kldap-17.12.3/src/ldapstructureproxymodel.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapstructureproxymodel.h 2018-04-21 13:57:39.000000000 +0000 @@ -33,7 +33,7 @@ Q_OBJECT public: explicit LdapStructureProxyModel(QObject *parent = nullptr); - ~LdapStructureProxyModel(); + ~LdapStructureProxyModel() override; QVariant data(const QModelIndex &index, int role) const override; /** diff -Nru kldap-17.12.3/src/ldapurl.cpp kldap-18.04.1/src/ldapurl.cpp --- kldap-17.12.3/src/ldapurl.cpp 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapurl.cpp 2018-04-21 13:57:39.000000000 +0000 @@ -48,11 +48,6 @@ LdapUrl::LdapUrl(const QUrl &_url) : QUrl(_url), d(new LdapUrlPrivate) { - QString tmp = path(); - if (tmp.startsWith(QLatin1Char('/'))) { - tmp = tmp.mid(1); - } - setPath(tmp); parseQuery(); } @@ -243,7 +238,7 @@ { Extension ext; QStringList extensions; - QString q = query(); + QString q = query(QUrl::FullyEncoded); // remove first ? if (q.startsWith(QLatin1Char('?'))) { q.remove(0, 1); diff -Nru kldap-17.12.3/src/ldapurl.h kldap-18.04.1/src/ldapurl.h --- kldap-17.12.3/src/ldapurl.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldapurl.h 2018-04-21 13:57:39.000000000 +0000 @@ -87,7 +87,7 @@ /** * Destroys the LDAP url. */ - virtual ~LdapUrl(); + ~LdapUrl(); /** * Sets the @p dn part of the LDAP url. diff -Nru kldap-17.12.3/src/ldif.h kldap-18.04.1/src/ldif.h --- kldap-17.12.3/src/ldif.h 2018-02-09 05:50:35.000000000 +0000 +++ kldap-18.04.1/src/ldif.h 2018-04-21 13:57:39.000000000 +0000 @@ -61,7 +61,7 @@ Ldif(const Ldif &that); Ldif &operator=(const Ldif &that); - virtual ~Ldif(); + ~Ldif(); /** * Assembles fieldname and value into a valid Ldif line, BASE64 encodes the