Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 00:25:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug # 164175: XPCom LDAP API extensions. OnLDAPInit() now passes relevant connection, and LDAP operations/connections accept closures. r=dmose sr=darin

Browse Source
This commit is contained in:
rjc%netscape.com 2005-11-15 20:09:03 +00:00
parent 26c5972d22
commit fa9d51e665
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
View File

@ -435,7 +435,7 @@ nsLDAPAutoCompleteSession::OnLDAPMessage(nsILDAPMessage *aMessage)
// void onLDAPInit (in nsresult aStatus);
//
NS_IMETHODIMP
nsLDAPAutoCompleteSession::OnLDAPInit(nsresult aStatus)
nsLDAPAutoCompleteSession::OnLDAPInit(nsILDAPConnection *aConn, nsresult aStatus)
{
nsresult rv; // temp for xpcom return values
nsCOMPtr<nsILDAPMessageListener> selfProxy;
@ -586,7 +586,7 @@ nsLDAPAutoCompleteSession::OnLDAPInit(nsresult aStatus)
// our OnLDAPMessage accepts all result callbacks
//
rv = mOperation->Init(mConnection, selfProxy);
rv = mOperation->Init(mConnection, selfProxy, nsnull);
if (NS_FAILED(rv)) {
FinishAutoCompleteLookup(nsIAutoCompleteStatus::failureItems, rv,
UNBOUND);
@ -696,7 +696,7 @@ nsLDAPAutoCompleteSession::OnLDAPBind(nsILDAPMessage *aMessage)
("nsLDAPAutoCompleteSession::OnLDAPBind(): auth error;"
" calling OnLDAPInit() again"));
return OnLDAPInit(NS_OK);
return OnLDAPInit(nsnull, NS_OK);
}
// reset to the default state
@ -871,7 +871,7 @@ nsLDAPAutoCompleteSession::StartLDAPSearch()
// initialize the LDAP operation object
//
rv = mOperation->Init(mConnection, selfProxy);
rv = mOperation->Init(mConnection, selfProxy, nsnull);
if (NS_FAILED(rv)) {
NS_ERROR("nsLDAPAutoCompleteSession::StartLDAPSearch(): couldn't "
"initialize LDAP operation");
@ -1141,7 +1141,7 @@ nsLDAPAutoCompleteSession::InitConnection()
rv = mConnection->Init(host.get(), port,
(options & nsILDAPURL::OPT_SECURE) ? PR_TRUE
: PR_FALSE, NS_ConvertUTF8toUCS2(mLogin).get(),
selfProxy);
selfProxy, nsnull);
if NS_FAILED(rv) {
switch (rv) {