summaryrefslogtreecommitdiff
path: root/extensions/source/config/ldap
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-11-04 17:06:47 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-11-04 16:57:59 +0100
commit628e96ce1fce194b30a5c2912feb8b7ec0328db0 (patch)
tree7a901d6da7d0dea1da3ac55ebe96fc33fc904150 /extensions/source/config/ldap
parent9d5365f7cacecf92f1f056dce7bb6bbaf9f0cc40 (diff)
tdf#120703 PVS: V547 Expression is always true/false
Change-Id: I3432afca1ee9bf9e8adce1d55d58d57bf1a09cb4 Reviewed-on: https://gerrit.libreoffice.org/62847 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'extensions/source/config/ldap')
-rw-r--r--extensions/source/config/ldap/ldapaccess.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index caece9d1cde5..e6a44aa1b0c1 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -73,11 +73,10 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
message += OUString::createFromAscii(aOperation) + ": ";
}
message += OUString::createFromAscii(ldap_err2string(aRetCode)) + " (" ;
- sal_Char *stub = nullptr ;
#ifndef LDAP_OPT_SIZELIMIT // for use with OpenLDAP
+ sal_Char* stub = nullptr;
ldap_get_lderrno(aConnection, NULL, &stub) ;
-#endif
if (stub != nullptr)
{
message += OUString::createFromAscii(stub) ;
@@ -88,7 +87,10 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
// This call is thus disabled for the moment.
//ldap_memfree(stub) ;
}
- else { message += "No additional information" ; }
+ else
+#endif
+ { message += "No additional information"; }
+
message += ")" ;
throw ldap::LdapGenericException(message, nullptr, aRetCode) ;
}