diff --git a/mozilla/directory/xpcom/base/public/nsILDAPConnection.idl b/mozilla/directory/xpcom/base/public/nsILDAPConnection.idl index 8a408ee9ecb..1322fdf18c2 100644 --- a/mozilla/directory/xpcom/base/public/nsILDAPConnection.idl +++ b/mozilla/directory/xpcom/base/public/nsILDAPConnection.idl @@ -48,10 +48,10 @@ interface nsILDAPConnection : nsISupports readonly attribute string errorString; // wrapper for ldap_init() - void Init(in string defhost, in short defport); + void init(in string defhost, in short defport); // wrapper for ldap_get_lderrno() - long GetLdErrno(out string matched, out string s); + long getLdErrno(out string matched, out string s); // really only for the internal use of nsLDAPOperation and friends // diff --git a/mozilla/directory/xpcom/base/public/nsILDAPOperation.idl b/mozilla/directory/xpcom/base/public/nsILDAPOperation.idl index b99aac5d3be..dc27b1a27eb 100644 --- a/mozilla/directory/xpcom/base/public/nsILDAPOperation.idl +++ b/mozilla/directory/xpcom/base/public/nsILDAPOperation.idl @@ -46,15 +46,15 @@ interface nsILDAPOperation : nsISupports // wrapper for ldap_simple_bind() // - void SimpleBind(in string binddn, in string passwd); + void simpleBind(in string binddn, in string passwd); // wrapper for ldap_search_url() // - void URLSearch(in string url, in boolean attrsonly); + void urlSearch(in string url, in boolean attrsonly); // wrapper for ldap_result() // XXX - timeout currently ignored // XXX - should add consts for all param // - long Result(in long all, in PRTime timeout, out nsILDAPMessage message); + long result(in long all, in PRTime timeout, out nsILDAPMessage message); }; diff --git a/mozilla/directory/xpcom/base/src/ldapSearch.cpp b/mozilla/directory/xpcom/base/src/ldapSearch.cpp index 2b7c3526d7e..e0524787ffe 100644 --- a/mozilla/directory/xpcom/base/src/ldapSearch.cpp +++ b/mozilla/directory/xpcom/base/src/ldapSearch.cpp @@ -136,7 +136,7 @@ lds(class nsLDAPChannel *chan, const char *url) // XXX what about timeouts? // XXX failure is a reasonable thing; don't assert // - rv = myOperation->URLSearch(url, PR_FALSE); + rv = myOperation->UrlSearch(url, PR_FALSE); NS_ENSURE_SUCCESS(rv,rv); // poll for results diff --git a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp index 08b50b13957..89965acf161 100644 --- a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp +++ b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp @@ -176,7 +176,7 @@ nsLDAPOperation::SearchExt(const char *base, // base DN to search // wrapper for ldap_url_search // NS_IMETHODIMP -nsLDAPOperation::URLSearch(const char *aURL, // the search URL +nsLDAPOperation::UrlSearch(const char *aURL, // the search URL PRBool aAttrsOnly) // skip attribute names? { NS_ENSURE_ARG(aURL);