User: hr Date: 06/06/19 18:51:17 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ MNSMozabProxy.cxx
Log: INTEGRATION: CWS warnings01 (1.4.30); FILE MERGED 2006/06/13 08:45:30 fs 1.4.30.6: #i66334# only try to bind with password if it's not empty 2006/04/07 20:23:42 sb 1.4.30.5: RESYNC: (1.5-1.6); FILE MERGED 2006/01/25 20:58:36 sb 1.4.30.4: RESYNC: (1.4-1.5); FILE MERGED 2005/12/22 11:44:55 fs 1.4.30.3: #i57457# warning-free code 2005/11/16 12:59:16 fs 1.4.30.2: #i57457# warning free code 2005/11/07 14:43:56 fs 1.4.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MNSMozabProxy.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx?r1=1.6&r2=1.7 Delta lines: +19 -15 --------------------- --- MNSMozabProxy.cxx 29 Mar 2006 12:18:58 -0000 1.6 +++ MNSMozabProxy.cxx 20 Jun 2006 01:51:15 -0000 1.7 @@ -47,14 +47,15 @@ #include "MQuery.hxx" #endif -#include <nsIProxyObjectManager.h> - #ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> #endif #ifndef _OSL_CONDITN_HXX_ #include <osl/conditn.hxx> #endif + +#include "pre_include_mozilla.h" +#include <nsIProxyObjectManager.h> // More Mozilla includes for LDAP Connection Test #include "prprf.h" #include "nsILDAPURL.h" @@ -63,6 +64,7 @@ #include "nsILDAPErrors.h" #include "nsILDAPConnection.h" #include "nsILDAPOperation.h" +#include "post_include_mozilla.h" #ifndef _CONNECTIVITY_MAB_QUERY_HXX_ #include "MQuery.hxx" @@ -239,7 +241,7 @@ NS_DECL_NSILDAPMESSAGELISTENER MLDAPMessageListener(); - ~MLDAPMessageListener(); + virtual ~MLDAPMessageListener(); sal_Bool connected(); protected: @@ -284,9 +286,8 @@ m_aCondition.set(); } -NS_IMETHODIMP MLDAPMessageListener::OnLDAPInit(nsILDAPConnection *aConn, nsresult aStatus ) +NS_IMETHODIMP MLDAPMessageListener::OnLDAPInit(nsILDAPConnection* /*aConn*/, nsresult aStatus ) { - // Make sure that the Init() worked properly if ( NS_FAILED(aStatus ) ) { setConnectionStatus( sal_False ); @@ -361,7 +362,7 @@ return rv; } nsresult -MNSMozabProxy::InitLDAP(sal_Char* sUri, sal_Unicode* sBindDN, sal_Unicode* sPasswd,sal_Bool * nUseSSL) +MNSMozabProxy::InitLDAP(sal_Char* sUri, sal_Unicode* sBindDN, sal_Unicode* pPasswd,sal_Bool * nUseSSL) { sal_Bool useSSL = *nUseSSL; nsresult rv; @@ -414,10 +415,13 @@ if (NS_FAILED(rv)) return NS_ERROR_UNEXPECTED; // this should never happen + if ( pPasswd && *pPasswd ) + { nsCAutoString nsPassword; - nsPassword.AssignWithConversion(sPasswd); - + nsPassword.AssignWithConversion(pPasswd); rv = ldapOperation->SimpleBind(nsPassword); + } + if (NS_SUCCEEDED(rv)) m_Args->arg5 = messageListener; return rv; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
