Commit 9456212b authored by peterv%netscape.com's avatar peterv%netscape.com
Browse files

Fix for bug 86000 (convert LDAP XPCOM SDK to use AUTF8String). r=dmose, sr=alecf.

parent da76dd0f

directory/xpcom/base/public/nsILDAPConnection.idl

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ interface nsILDAPConnection : nsISupports 
     *

     * @exception NS_ERROR_OUT_OF_MEMORY

     */

    readonly attribute wstring bindName;

    readonly attribute AUTF8String bindName;

    

    /**

     * private parameter (anything caller desires)
@@ -76,7 +76,7 @@ interface nsILDAPConnection : nsISupports 
     * @exception NS_ERROR_UNEXPECTED           internal error

     */

    void init(in string aHost, in short aPort, in boolean aSSL,

              in wstring aBindName, 

              in AUTF8String aBindName, 

              in nsILDAPMessageListener aMessageListener,

              in nsISupports aClosure);
@@ -93,5 +93,5 @@ interface nsILDAPConnection : nsISupports 
     * 

     * @return          the error code, as defined in nsILDAPErrors.idl

     */

    long getLdErrno(out wstring matched, out wstring s);

    long getLdErrno(out AUTF8String matched, out AUTF8String s);

};

directory/xpcom/base/public/nsILDAPMessage.idl

+3 −8
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ 


#include "nsISupports.idl"



/* hack around XPIDL bug 78848; when that's fixed, this can disappear */

%{C++

#include "nsAString.h"

%}



interface nsILDAPBERValue;

interface nsILDAPOperation;
@@ -53,7 +48,7 @@ interface nsILDAPMessage : nsISupports 
     * @exception NS_ERROR_LDAP_DECODING_ERROR  problem during BER-decoding

     * @exception NS_ERROR_UNEXPECTED           bug or memory corruption

     */

    readonly attribute wstring dn;

    readonly attribute AUTF8String dn;



    /**

     * Get all the attributes in this message.
@@ -172,14 +167,14 @@ interface nsILDAPMessage : nsISupports 
    /**

     * Additional error information optionally sent by the server.

     */

    readonly attribute AString errorMessage;

    readonly attribute AUTF8String errorMessage;



    /**

     * In LDAPv3, when the server returns any of the following errors:

     * NO_SUCH_OBJECT, ALIAS_PROBLEM, INVALID_DN_SYNTAX, ALIAS_DEREF_PROBLEM,

     * it also returns the closest existing DN to the entry requested.

     */

    readonly attribute AString matchedDn;

    readonly attribute AUTF8String matchedDn;



    /**

     * Get an array of all the attribute values in this message (a wrapper

directory/xpcom/base/public/nsILDAPMessageListener.idl

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
 */



#include "nsISupports.idl"

#include "nsILDAPMessage.idl"



interface nsILDAPMessage;



interface nsILDAPConnection;

directory/xpcom/base/public/nsILDAPOperation.idl

+3 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ interface nsILDAPOperation : nsISupports 
     * @exception NS_ERROR_OUT_OF_MEMORY        ran out of memory

     * @exception NS_ERROR_UNEXPECTED           internal error

     */

    void simpleBind(in wstring passwd);

    void simpleBind(in AUTF8String passwd);



    /**

     * Kicks off an asynchronous search request.  The "ext" stands for
@@ -131,8 +131,8 @@ interface nsILDAPOperation : nsISupports 
     *

     * XXX doesn't currently handle LDAPControl params

     */

    void searchExt(in wstring aBaseDn, in PRInt32 aScope,

                   in wstring aFilter, in unsigned long aAttrCount,

    void searchExt(in AUTF8String aBaseDn, in PRInt32 aScope,

                   in AUTF8String aFilter, in unsigned long aAttrCount,

                   [array, size_is(aAttrCount)] in string aAttributes,

                   in PRIntervalTime aTimeOut, in PRInt32 aSizeLimit);

directory/xpcom/base/public/nsILDAPServer.idl

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ interface nsILDAPServer : nsISupports { 
     * @exception NS_ERROR_NULL_POINTER     NULL pointer to GET method

     * @exception NS_ERROR_OUT_OF_MEMORY    ran out of memory

     */

    attribute wstring password;

    attribute AUTF8String password;



    /**

     * the user name to authenticate as. An empty string here would
@@ -77,7 +77,7 @@ interface nsILDAPServer : nsISupports { 
     * @exception NS_ERROR_NULL_POINTER     NULL pointer to GET method

     * @exception NS_ERROR_OUT_OF_MEMORY    ran out of memory

     */

    attribute wstring username;

    attribute AUTF8String username;



    /**

     * the bind DN (Distinguished Name).
@@ -85,7 +85,7 @@ interface nsILDAPServer : nsISupports { 
     * @exception NS_ERROR_NULL_POINTER     NULL pointer to GET method

     * @exception NS_ERROR_OUT_OF_MEMORY    ran out of memory

     */

    attribute wstring binddn;

    attribute AUTF8String binddn;



    /** maximum number of hits we want to accept from an LDAP search

     *  operation.