diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-10-05 16:40:11 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-10-05 16:42:24 +0200 |
| commit | 47312cae2a1c5168124e44db409dd6205a05cf90 (patch) | |
| tree | e41264b2f09ebfd1f9db3027accc1fed72163bdf /extensions | |
| parent | WaE: unsafe mix of type 'bool' and type 'sal_Bool' in operation (diff) | |
| download | core-47312cae2a1c5168124e44db409dd6205a05cf90.tar.gz core-47312cae2a1c5168124e44db409dd6205a05cf90.zip | |
fix compilation after the recent OUString::operator char*() removal
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 976b4a4bbbe6..6d38d9171f84 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -155,8 +155,8 @@ void LdapConnection::connectSimple() // Do the bind LdapErrCode retCode = (*s_p_simple_bind_s)(mConnection, - mLdapDefinition.mAnonUser , - mLdapDefinition.mAnonCredentials) ; + mLdapDefinition.mAnonUser.getStr(), + mLdapDefinition.mAnonCredentials.getStr()) ; checkLdapReturnCode("SimpleBind", retCode, mConnection) ; } @@ -175,14 +175,14 @@ void LdapConnection::initConnection() if (mLdapDefinition.mPort == 0) mLdapDefinition.mPort = LDAP_PORT; - mConnection = (*s_p_init)(mLdapDefinition.mServer, + mConnection = (*s_p_init)(mLdapDefinition.mServer.getStr(), mLdapDefinition.mPort) ; if (mConnection == NULL) { rtl::OUStringBuffer message ; message.appendAscii("Cannot initialise connection to LDAP server ") ; - message.appendAscii(mLdapDefinition.mServer) ; + message.appendAscii(mLdapDefinition.mServer.getStr()) ; message.appendAscii(":") ; message.append(mLdapDefinition.mPort) ; throw ldap::LdapConnectionException(message.makeStringAndClear(), @@ -202,7 +202,7 @@ void LdapConnection::initConnection() LdapMessageHolder result; LdapErrCode retCode = (*s_p_search_s)(mConnection, - aUserDn, + aUserDn.getStr(), LDAP_SCOPE_BASE, "(objectclass=*)", 0, @@ -252,9 +252,9 @@ void LdapConnection::initConnection() attributes[0]= const_cast<sal_Char *>(LDAP_NO_ATTRS); attributes[1]= NULL; LdapErrCode retCode = (*s_p_search_s)(mConnection, - mLdapDefinition.mBaseDN, + mLdapDefinition.mBaseDN.getStr(), LDAP_SCOPE_SUBTREE, - filter.makeStringAndClear(), attributes, 0, &result.msg) ; + filter.makeStringAndClear().getStr(), attributes, 0, &result.msg) ; checkLdapReturnCode("FindUserDn", retCode,mConnection) ; rtl::OString userDn ; |