| winldap.h (6.0.6002.18005-Windows 6.0) | | winldap.h (6.1.7601.17514-Windows 7.0) |
|---|
| | |
| skipping to change at line 592 | | skipping to change at line 592 |
|---|
| // GetLastError(). | | // GetLastError(). |
| // | | // |
| // ldap_open actually opens the connection at the time of the call, | | // ldap_open actually opens the connection at the time of the call, |
| // whereas ldap_init only opens the connection when an operation is performed | | // whereas ldap_init only opens the connection when an operation is performed |
| // that requires it. | | // that requires it. |
| // | | // |
| // multi-thread: ldap_open*, ldap_init*, and ldap_sslinit* calls are safe. | | // multi-thread: ldap_open*, ldap_init*, and ldap_sslinit* calls are safe. |
| // | | // |
| | |
| WINLDAPAPI LDAP * LDAPAPI ldap_openW( __in const PWCHAR HostName, ULONG PortNumb
er ); | | WINLDAPAPI LDAP * LDAPAPI ldap_openW( __in const PWCHAR HostName, ULONG PortNumb
er ); |
|
| WINLDAPAPI LDAP * LDAPAPI ldap_openA( const PCHAR HostName, ULONG PortNumber ); | | WINLDAPAPI LDAP * LDAPAPI ldap_openA( __in const PCHAR HostName, ULONG PortNumbe
r ); |
| | |
| WINLDAPAPI LDAP * LDAPAPI ldap_initW( __in const PWCHAR HostName, ULONG PortNumb
er ); | | WINLDAPAPI LDAP * LDAPAPI ldap_initW( __in const PWCHAR HostName, ULONG PortNumb
er ); |
|
| WINLDAPAPI LDAP * LDAPAPI ldap_initA( const PCHAR HostName, ULONG PortNumber ); | | WINLDAPAPI LDAP * LDAPAPI ldap_initA( __in const PCHAR HostName, ULONG PortNumbe
r ); |
| | |
| WINLDAPAPI LDAP * LDAPAPI ldap_sslinitW( __in PWCHAR HostName, ULONG PortNumber,
int secure ); | | WINLDAPAPI LDAP * LDAPAPI ldap_sslinitW( __in PWCHAR HostName, ULONG PortNumber,
int secure ); |
|
| WINLDAPAPI LDAP * LDAPAPI ldap_sslinitA( PCHAR HostName, ULONG PortNumber, int s
ecure ); | | WINLDAPAPI LDAP * LDAPAPI ldap_sslinitA( __in PCHAR HostName, ULONG PortNumber,
int secure ); |
| | |
| // | | // |
| // when calling ldap_init, you can call ldap_connect explicitly to have the | | // when calling ldap_init, you can call ldap_connect explicitly to have the |
| // library contact the server. This is useful for checking for server | | // library contact the server. This is useful for checking for server |
| // availability. This call is not required however, since the other functions | | // availability. This call is not required however, since the other functions |
| // will call it internally if it hasn't already been called. | | // will call it internally if it hasn't already been called. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_connect( LDAP *ld, | | WINLDAPAPI ULONG LDAPAPI ldap_connect( LDAP *ld, |
| struct l_timeval *timeout | | struct l_timeval *timeout |
| | |
| skipping to change at line 876 | | skipping to change at line 876 |
|---|
| | |
| // | | // |
| // Bind is required as the first operation to v2 servers, not so for v3 | | // Bind is required as the first operation to v2 servers, not so for v3 |
| // servers. See above description of authentication methods. | | // servers. See above description of authentication methods. |
| // | | // |
| // multi-thread: bind calls are not safe in that it affects the | | // multi-thread: bind calls are not safe in that it affects the |
| // connection as a whole. beware if threads share connections | | // connection as a whole. beware if threads share connections |
| // and try to mulithread binds with other operations. | | // and try to mulithread binds with other operations. |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_simple_bindW( LDAP *ld, __in_opt PWCHAR dn, __in_o
pt PWCHAR passwd ); | | WINLDAPAPI ULONG LDAPAPI ldap_simple_bindW( LDAP *ld, __in_opt PWCHAR dn, __in_o
pt PWCHAR passwd ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_simple_bindA( LDAP *ld, PCHAR dn, PCHAR passwd ); | | WINLDAPAPI ULONG LDAPAPI ldap_simple_bindA( LDAP *ld, __in_opt PCHAR dn, __in_op
t PCHAR passwd ); |
| WINLDAPAPI ULONG LDAPAPI ldap_simple_bind_sW( LDAP *ld, __in_opt PWCHAR dn, __in
_opt PWCHAR passwd ); | | WINLDAPAPI ULONG LDAPAPI ldap_simple_bind_sW( LDAP *ld, __in_opt PWCHAR dn, __in
_opt PWCHAR passwd ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_simple_bind_sA( LDAP *ld, PCHAR dn, PCHAR passwd )
; | | WINLDAPAPI ULONG LDAPAPI ldap_simple_bind_sA( LDAP *ld, __in_opt PCHAR dn, __in_
opt PCHAR passwd ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_bindW( LDAP *ld, __in_opt PWCHAR dn, __in_opt PWCH
AR cred, ULONG method ); | | WINLDAPAPI ULONG LDAPAPI ldap_bindW( LDAP *ld, __in_opt PWCHAR dn, __in_opt PWCH
AR cred, ULONG method ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_bindA( LDAP *ld, PCHAR dn, PCHAR cred, ULONG metho
d ); | | WINLDAPAPI ULONG LDAPAPI ldap_bindA( LDAP *ld, __in_opt PCHAR dn, __in_opt PCHAR
cred, ULONG method ); |
| WINLDAPAPI ULONG LDAPAPI ldap_bind_sW( LDAP *ld, __in_opt PWCHAR dn, __in_opt PW
CHAR cred, ULONG method ); | | WINLDAPAPI ULONG LDAPAPI ldap_bind_sW( LDAP *ld, __in_opt PWCHAR dn, __in_opt PW
CHAR cred, ULONG method ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_bind_sA( LDAP *ld, PCHAR dn, PCHAR cred, ULONG met
hod ); | | WINLDAPAPI ULONG LDAPAPI ldap_bind_sA( LDAP *ld, __in_opt PCHAR dn, __in_opt PCH
AR cred, ULONG method ); |
| | |
| // | | // |
| // The following functions can be used to pass in any arbitrary credentials | | // The following functions can be used to pass in any arbitrary credentials |
| // to the server. The application must be ready to interpret the response | | // to the server. The application must be ready to interpret the response |
| // sent back from the server. | | // sent back from the server. |
| // | | // |
| | |
| WINLDAPAPI INT LDAPAPI ldap_sasl_bindA( | | WINLDAPAPI INT LDAPAPI ldap_sasl_bindA( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
| __in const PCHAR DistName, | | __in const PCHAR DistName, |
| | |
| skipping to change at line 1006 | | skipping to change at line 1006 |
|---|
| LDAP *ld, | | LDAP *ld, |
| __in const PWCHAR base, | | __in const PWCHAR base, |
| ULONG scope, | | ULONG scope, |
| __in const PWCHAR filter, | | __in const PWCHAR filter, |
| __in PWCHAR attrs[], | | __in PWCHAR attrs[], |
| ULONG attrsonly, | | ULONG attrsonly, |
| LDAPMessage **res | | LDAPMessage **res |
| ); | | ); |
| WINLDAPAPI ULONG LDAPAPI ldap_search_sA( | | WINLDAPAPI ULONG LDAPAPI ldap_search_sA( |
| LDAP *ld, | | LDAP *ld, |
|
| const PCHAR base, | | __in const PCHAR base, |
| ULONG scope, | | ULONG scope, |
|
| const PCHAR filter, | | __in const PCHAR filter, |
| PCHAR attrs[], | | __in PCHAR attrs[], |
| ULONG attrsonly, | | ULONG attrsonly, |
| LDAPMessage **res | | LDAPMessage **res |
| ); | | ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_search_stW( | | WINLDAPAPI ULONG LDAPAPI ldap_search_stW( |
| LDAP *ld, | | LDAP *ld, |
| __in const PWCHAR base, | | __in const PWCHAR base, |
| ULONG scope, | | ULONG scope, |
| __in const PWCHAR filter, | | __in const PWCHAR filter, |
| __in PWCHAR attrs[], | | __in PWCHAR attrs[], |
| ULONG attrsonly, | | ULONG attrsonly, |
| struct l_timeval *timeout, | | struct l_timeval *timeout, |
| LDAPMessage **res | | LDAPMessage **res |
| ); | | ); |
| WINLDAPAPI ULONG LDAPAPI ldap_search_stA( | | WINLDAPAPI ULONG LDAPAPI ldap_search_stA( |
| LDAP *ld, | | LDAP *ld, |
|
| const PCHAR base, | | __in const PCHAR base, |
| ULONG scope, | | ULONG scope, |
|
| const PCHAR filter, | | __in const PCHAR filter, |
| PCHAR attrs[], | | __in PCHAR attrs[], |
| ULONG attrsonly, | | ULONG attrsonly, |
| struct l_timeval *timeout, | | struct l_timeval *timeout, |
| LDAPMessage **res | | LDAPMessage **res |
| ); | | ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_search_extW( | | WINLDAPAPI ULONG LDAPAPI ldap_search_extW( |
| LDAP *ld, | | LDAP *ld, |
| __in const PWCHAR base, | | __in const PWCHAR base, |
| ULONG scope, | | ULONG scope, |
| __in const PWCHAR filter, | | __in const PWCHAR filter, |
| | |
| skipping to change at line 1201 | | skipping to change at line 1201 |
|---|
| // is returned rather than the return code. You have to look | | // is returned rather than the return code. You have to look |
| // at the connection block in an error case and the return code | | // at the connection block in an error case and the return code |
| // may be overwritten by another thread inbetween. | | // may be overwritten by another thread inbetween. |
| // | | // |
| // Use ldap_modify_ext instead, as these are thread safe. | | // Use ldap_modify_ext instead, as these are thread safe. |
| // | | // |
| // ldap_modify_s and ldap_modify_ext* calls are thread safe. | | // ldap_modify_s and ldap_modify_ext* calls are thread safe. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_modifyW( LDAP *ld, __in PWCHAR dn, LDAPModW *mods[
] ); | | WINLDAPAPI ULONG LDAPAPI ldap_modifyW( LDAP *ld, __in PWCHAR dn, LDAPModW *mods[
] ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_modifyA( LDAP *ld, PCHAR dn, LDAPModA *mods[] ); | | WINLDAPAPI ULONG LDAPAPI ldap_modifyA( LDAP *ld, __in PCHAR dn, LDAPModA *mods[]
); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_modify_sW( LDAP *ld, __in PWCHAR dn, LDAPModW *mod
s[] ); | | WINLDAPAPI ULONG LDAPAPI ldap_modify_sW( LDAP *ld, __in PWCHAR dn, LDAPModW *mod
s[] ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_modify_sA( LDAP *ld, PCHAR dn, LDAPModA *mods[] ); | | WINLDAPAPI ULONG LDAPAPI ldap_modify_sA( LDAP *ld, __in PCHAR dn, LDAPModA *mods
[] ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_modify_extW( | | WINLDAPAPI ULONG LDAPAPI ldap_modify_extW( |
| LDAP *ld, | | LDAP *ld, |
| __in const PWCHAR dn, | | __in const PWCHAR dn, |
| LDAPModW *mods[], | | LDAPModW *mods[], |
| PLDAPControlW *ServerControls, | | PLDAPControlW *ServerControls, |
| PLDAPControlW *ClientControls, | | PLDAPControlW *ClientControls, |
| ULONG *MessageNumber | | ULONG *MessageNumber |
| ); | | ); |
| | |
| | |
| skipping to change at line 1315 | | skipping to change at line 1315 |
|---|
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_modrdn2W ( | | WINLDAPAPI ULONG LDAPAPI ldap_modrdn2W ( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
| __in const PWCHAR DistinguishedName, | | __in const PWCHAR DistinguishedName, |
| __in const PWCHAR NewDistinguishedName, | | __in const PWCHAR NewDistinguishedName, |
| INT DeleteOldRdn | | INT DeleteOldRdn |
| ); | | ); |
| WINLDAPAPI ULONG LDAPAPI ldap_modrdn2A ( | | WINLDAPAPI ULONG LDAPAPI ldap_modrdn2A ( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
|
| const PCHAR DistinguishedName, | | __in const PCHAR DistinguishedName, |
| const PCHAR NewDistinguishedName, | | __in const PCHAR NewDistinguishedName, |
| INT DeleteOldRdn | | INT DeleteOldRdn |
| ); | | ); |
| | |
| // | | // |
| // ldap_modrdn simply calls ldap_modrdn2 with a value of 1 for DeleteOldRdn. | | // ldap_modrdn simply calls ldap_modrdn2 with a value of 1 for DeleteOldRdn. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_modrdnW ( | | WINLDAPAPI ULONG LDAPAPI ldap_modrdnW ( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
| __in const PWCHAR DistinguishedName, | | __in const PWCHAR DistinguishedName, |
| __in const PWCHAR NewDistinguishedName | | __in const PWCHAR NewDistinguishedName |
| ); | | ); |
| WINLDAPAPI ULONG LDAPAPI ldap_modrdnA ( | | WINLDAPAPI ULONG LDAPAPI ldap_modrdnA ( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
|
| const PCHAR DistinguishedName, | | __in const PCHAR DistinguishedName, |
| const PCHAR NewDistinguishedName | | __in const PCHAR NewDistinguishedName |
| ); | | ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_modrdn2_sW ( | | WINLDAPAPI ULONG LDAPAPI ldap_modrdn2_sW ( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
| __in const PWCHAR DistinguishedName, | | __in const PWCHAR DistinguishedName, |
| __in const PWCHAR NewDistinguishedName, | | __in const PWCHAR NewDistinguishedName, |
| INT DeleteOldRdn | | INT DeleteOldRdn |
| ); | | ); |
| WINLDAPAPI ULONG LDAPAPI ldap_modrdn2_sA ( | | WINLDAPAPI ULONG LDAPAPI ldap_modrdn2_sA ( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
|
| const PCHAR DistinguishedName, | | __in const PCHAR DistinguishedName, |
| const PCHAR NewDistinguishedName, | | __in const PCHAR NewDistinguishedName, |
| INT DeleteOldRdn | | INT DeleteOldRdn |
| ); | | ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_modrdn_sW ( | | WINLDAPAPI ULONG LDAPAPI ldap_modrdn_sW ( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
| __in const PWCHAR DistinguishedName, | | __in const PWCHAR DistinguishedName, |
| __in const PWCHAR NewDistinguishedName | | __in const PWCHAR NewDistinguishedName |
| ); | | ); |
| WINLDAPAPI ULONG LDAPAPI ldap_modrdn_sA ( | | WINLDAPAPI ULONG LDAPAPI ldap_modrdn_sA ( |
| LDAP *ExternalHandle, | | LDAP *ExternalHandle, |
|
| const PCHAR DistinguishedName, | | __in const PCHAR DistinguishedName, |
| const PCHAR NewDistinguishedName | | __in const PCHAR NewDistinguishedName |
| ); | | ); |
| | |
| #if LDAP_UNICODE | | #if LDAP_UNICODE |
| | |
| #define ldap_modrdn2 ldap_modrdn2W | | #define ldap_modrdn2 ldap_modrdn2W |
| #define ldap_modrdn ldap_modrdnW | | #define ldap_modrdn ldap_modrdnW |
| #define ldap_modrdn2_s ldap_modrdn2_sW | | #define ldap_modrdn2_s ldap_modrdn2_sW |
| #define ldap_modrdn_s ldap_modrdn_sW | | #define ldap_modrdn_s ldap_modrdn_sW |
| | |
| #else | | #else |
| | |
| skipping to change at line 1497 | | skipping to change at line 1497 |
|---|
| // is returned rather than the return code. You have to look | | // is returned rather than the return code. You have to look |
| // at the connection block in an error case and the return code | | // at the connection block in an error case and the return code |
| // may be overwritten by another thread inbetween. | | // may be overwritten by another thread inbetween. |
| // | | // |
| // Use ldap_add_ext instead, as these are thread safe. | | // Use ldap_add_ext instead, as these are thread safe. |
| // | | // |
| // ldap_add_s and ldap_add_ext* calls are thread safe. | | // ldap_add_s and ldap_add_ext* calls are thread safe. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_addW( LDAP *ld, __in PWCHAR dn, LDAPModW *attrs[]
); | | WINLDAPAPI ULONG LDAPAPI ldap_addW( LDAP *ld, __in PWCHAR dn, LDAPModW *attrs[]
); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_addA( LDAP *ld, PCHAR dn, LDAPModA *attrs[] ); | | WINLDAPAPI ULONG LDAPAPI ldap_addA( LDAP *ld, __in PCHAR dn, LDAPModA *attrs[] )
; |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_add_sW( LDAP *ld, __in PWCHAR dn, LDAPModW *attrs[
] ); | | WINLDAPAPI ULONG LDAPAPI ldap_add_sW( LDAP *ld, __in PWCHAR dn, LDAPModW *attrs[
] ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_add_sA( LDAP *ld, PCHAR dn, LDAPModA *attrs[] ); | | WINLDAPAPI ULONG LDAPAPI ldap_add_sA( LDAP *ld, __in PCHAR dn, LDAPModA *attrs[]
); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_add_extW( | | WINLDAPAPI ULONG LDAPAPI ldap_add_extW( |
| LDAP *ld, | | LDAP *ld, |
| __in const PWCHAR dn, | | __in const PWCHAR dn, |
| LDAPModW *attrs[], | | LDAPModW *attrs[], |
| PLDAPControlW *ServerControls, | | PLDAPControlW *ServerControls, |
| PLDAPControlW *ClientControls, | | PLDAPControlW *ClientControls, |
| ULONG *MessageNumber | | ULONG *MessageNumber |
| ); | | ); |
| | |
| | |
| skipping to change at line 1584 | | skipping to change at line 1584 |
|---|
| // is returned rather than the return code. You have to look | | // is returned rather than the return code. You have to look |
| // at the connection block in an error case and the return code | | // at the connection block in an error case and the return code |
| // may be overwritten by another thread inbetween. | | // may be overwritten by another thread inbetween. |
| // | | // |
| // Use ldap_compare_ext instead, as these are thread safe. | | // Use ldap_compare_ext instead, as these are thread safe. |
| // | | // |
| // ldap_compare_s and ldap_compare_ext* calls are thread safe. | | // ldap_compare_s and ldap_compare_ext* calls are thread safe. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_compareW( LDAP *ld, __in const PWCHAR dn, __in con
st PWCHAR attr, __in PWCHAR value ); | | WINLDAPAPI ULONG LDAPAPI ldap_compareW( LDAP *ld, __in const PWCHAR dn, __in con
st PWCHAR attr, __in PWCHAR value ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_compareA( LDAP *ld, const PCHAR dn, const PCHAR at
tr, PCHAR value ); | | WINLDAPAPI ULONG LDAPAPI ldap_compareA( LDAP *ld, __in const PCHAR dn, __in cons
t PCHAR attr, __in PCHAR value ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_compare_sW( LDAP *ld, __in const PWCHAR dn, __in c
onst PWCHAR attr, __in PWCHAR value ); | | WINLDAPAPI ULONG LDAPAPI ldap_compare_sW( LDAP *ld, __in const PWCHAR dn, __in c
onst PWCHAR attr, __in PWCHAR value ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_compare_sA( LDAP *ld, const PCHAR dn, const PCHAR
attr, PCHAR value ); | | WINLDAPAPI ULONG LDAPAPI ldap_compare_sA( LDAP *ld, __in const PCHAR dn, __in co
nst PCHAR attr, PCHAR value ); |
| | |
| #if LDAP_UNICODE | | #if LDAP_UNICODE |
| | |
| #define ldap_compare ldap_compareW | | #define ldap_compare ldap_compareW |
| #define ldap_compare_s ldap_compare_sW | | #define ldap_compare_s ldap_compare_sW |
| | |
| #else | | #else |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_compare( LDAP *ld, __in const PCHAR dn, __in const
PCHAR attr, __in PCHAR value ); | | WINLDAPAPI ULONG LDAPAPI ldap_compare( LDAP *ld, __in const PCHAR dn, __in const
PCHAR attr, __in PCHAR value ); |
| WINLDAPAPI ULONG LDAPAPI ldap_compare_s( LDAP *ld, __in const PCHAR dn, __in con
st PCHAR attr, __in PCHAR value ); | | WINLDAPAPI ULONG LDAPAPI ldap_compare_s( LDAP *ld, __in const PCHAR dn, __in con
st PCHAR attr, __in PCHAR value ); |
| | |
| skipping to change at line 1698 | | skipping to change at line 1698 |
|---|
| // is returned rather than the return code. You have to look | | // is returned rather than the return code. You have to look |
| // at the connection block in an error case and the return code | | // at the connection block in an error case and the return code |
| // may be overwritten by another thread inbetween. | | // may be overwritten by another thread inbetween. |
| // | | // |
| // Use ldap_delete_ext instead, as these are thread safe. | | // Use ldap_delete_ext instead, as these are thread safe. |
| // | | // |
| // ldap_delete_s and ldap_delete_ext* calls are thread safe. | | // ldap_delete_s and ldap_delete_ext* calls are thread safe. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_deleteW( LDAP *ld, __in const PWCHAR dn ); | | WINLDAPAPI ULONG LDAPAPI ldap_deleteW( LDAP *ld, __in const PWCHAR dn ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_deleteA( LDAP *ld, const PCHAR dn ); | | WINLDAPAPI ULONG LDAPAPI ldap_deleteA( LDAP *ld, __in const PCHAR dn ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_delete_sW( LDAP *ld, __in const PWCHAR dn ); | | WINLDAPAPI ULONG LDAPAPI ldap_delete_sW( LDAP *ld, __in const PWCHAR dn ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_delete_sA( LDAP *ld, const PCHAR dn ); | | WINLDAPAPI ULONG LDAPAPI ldap_delete_sA( LDAP *ld, __in const PCHAR dn ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_delete_extW( | | WINLDAPAPI ULONG LDAPAPI ldap_delete_extW( |
| LDAP *ld, | | LDAP *ld, |
| __in const PWCHAR dn, | | __in const PWCHAR dn, |
| PLDAPControlW *ServerControls, | | PLDAPControlW *ServerControls, |
| PLDAPControlW *ClientControls, | | PLDAPControlW *ClientControls, |
| ULONG *MessageNumber | | ULONG *MessageNumber |
| ); | | ); |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_delete_extA( | | WINLDAPAPI ULONG LDAPAPI ldap_delete_extA( |
| | |
| skipping to change at line 2122 | | skipping to change at line 2122 |
|---|
| __in const PCHAR attr | | __in const PCHAR attr |
| ); | | ); |
| | |
| #endif | | #endif |
| | |
| // | | // |
| // Return the number of values in a list returned by ldap_get_values. | | // Return the number of values in a list returned by ldap_get_values. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_count_valuesW( __in_opt PWCHAR *vals ); | | WINLDAPAPI ULONG LDAPAPI ldap_count_valuesW( __in_opt PWCHAR *vals ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_count_valuesA( PCHAR *vals ); | | WINLDAPAPI ULONG LDAPAPI ldap_count_valuesA( __in_opt PCHAR *vals ); |
| | |
| #if LDAP_UNICODE | | #if LDAP_UNICODE |
| | |
| #define ldap_count_values ldap_count_valuesW | | #define ldap_count_values ldap_count_valuesW |
| | |
| #else | | #else |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_count_values( __in_opt PCHAR *vals ); | | WINLDAPAPI ULONG LDAPAPI ldap_count_values( __in_opt PCHAR *vals ); |
| | |
| #endif | | #endif |
| | |
| skipping to change at line 2145 | | skipping to change at line 2145 |
|---|
| // Return the number of values in a list returned by ldap_get_values_len. | | // Return the number of values in a list returned by ldap_get_values_len. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_count_values_len( struct berval **vals ); | | WINLDAPAPI ULONG LDAPAPI ldap_count_values_len( struct berval **vals ); |
| | |
| // | | // |
| // Free structures returned by ldap_get_values. | | // Free structures returned by ldap_get_values. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_value_freeW( __in_opt PWCHAR *vals ); | | WINLDAPAPI ULONG LDAPAPI ldap_value_freeW( __in_opt PWCHAR *vals ); |
|
| WINLDAPAPI ULONG LDAPAPI ldap_value_freeA( PCHAR *vals ); | | WINLDAPAPI ULONG LDAPAPI ldap_value_freeA( __in_opt PCHAR *vals ); |
| | |
| #if LDAP_UNICODE | | #if LDAP_UNICODE |
| | |
| #define ldap_value_free ldap_value_freeW | | #define ldap_value_free ldap_value_freeW |
| | |
| #else | | #else |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_value_free( __in_opt PCHAR *vals ); | | WINLDAPAPI ULONG LDAPAPI ldap_value_free( __in_opt PCHAR *vals ); |
| | |
| #endif | | #endif |
| | |
| skipping to change at line 2187 | | skipping to change at line 2187 |
|---|
| WINLDAPAPI PCHAR LDAPAPI ldap_get_dn( LDAP *ld, LDAPMessage *entry ); | | WINLDAPAPI PCHAR LDAPAPI ldap_get_dn( LDAP *ld, LDAPMessage *entry ); |
| | |
| #endif | | #endif |
| | |
| // | | // |
| // When using ldap_explode_dn, you should free the returned string by | | // When using ldap_explode_dn, you should free the returned string by |
| // calling ldap_value_free. | | // calling ldap_value_free. |
| // | | // |
| | |
| WINLDAPAPI PWCHAR *LDAPAPI ldap_explode_dnW( __in const PWCHAR dn, ULONG notypes
); | | WINLDAPAPI PWCHAR *LDAPAPI ldap_explode_dnW( __in const PWCHAR dn, ULONG notypes
); |
|
| WINLDAPAPI PCHAR *LDAPAPI ldap_explode_dnA( const PCHAR dn, ULONG notypes ); | | WINLDAPAPI PCHAR *LDAPAPI ldap_explode_dnA( __in const PCHAR dn, ULONG notypes )
; |
| | |
| #if LDAP_UNICODE | | #if LDAP_UNICODE |
| | |
| #define ldap_explode_dn ldap_explode_dnW | | #define ldap_explode_dn ldap_explode_dnW |
| | |
| #else | | #else |
| | |
| WINLDAPAPI PCHAR *LDAPAPI ldap_explode_dn( __in const PCHAR dn, ULONG notypes ); | | WINLDAPAPI PCHAR *LDAPAPI ldap_explode_dn( __in const PCHAR dn, ULONG notypes ); |
| | |
| #endif | | #endif |
| | |
| // | | // |
| // When calling ldap_dn2ufn, you should free the returned string by calling | | // When calling ldap_dn2ufn, you should free the returned string by calling |
| // ldap_memfree. | | // ldap_memfree. |
| // | | // |
| | |
| WINLDAPAPI PWCHAR LDAPAPI ldap_dn2ufnW( __in const PWCHAR dn ); | | WINLDAPAPI PWCHAR LDAPAPI ldap_dn2ufnW( __in const PWCHAR dn ); |
|
| WINLDAPAPI PCHAR LDAPAPI ldap_dn2ufnA( const PCHAR dn ); | | WINLDAPAPI PCHAR LDAPAPI ldap_dn2ufnA( __in const PCHAR dn ); |
| | |
| #if LDAP_UNICODE | | #if LDAP_UNICODE |
| | |
| #define ldap_dn2ufn ldap_dn2ufnW | | #define ldap_dn2ufn ldap_dn2ufnW |
| | |
| #else | | #else |
| | |
| WINLDAPAPI PCHAR LDAPAPI ldap_dn2ufn( __in const PCHAR dn ); | | WINLDAPAPI PCHAR LDAPAPI ldap_dn2ufn( __in const PCHAR dn ); |
| | |
| #endif | | #endif |
| | |
| // | | // |
| // This is used to free strings back to the LDAP API heap. Don't pass in | | // This is used to free strings back to the LDAP API heap. Don't pass in |
| // values that you've gotten from ldap_open, ldap_get_values, etc. | | // values that you've gotten from ldap_open, ldap_get_values, etc. |
| // | | // |
| | |
| WINLDAPAPI VOID LDAPAPI ldap_memfreeW( __in PWCHAR Block ); | | WINLDAPAPI VOID LDAPAPI ldap_memfreeW( __in PWCHAR Block ); |
|
| WINLDAPAPI VOID LDAPAPI ldap_memfreeA( PCHAR Block ); | | WINLDAPAPI VOID LDAPAPI ldap_memfreeA( __in PCHAR Block ); |
| | |
| WINLDAPAPI VOID LDAPAPI ber_bvfree( struct berval *bv ); | | WINLDAPAPI VOID LDAPAPI ber_bvfree( struct berval *bv ); |
| | |
| #if LDAP_UNICODE | | #if LDAP_UNICODE |
| | |
| #define ldap_memfree ldap_memfreeW | | #define ldap_memfree ldap_memfreeW |
| | |
| #else | | #else |
| | |
| WINLDAPAPI VOID LDAPAPI ldap_memfree( __in PCHAR Block ); | | WINLDAPAPI VOID LDAPAPI ldap_memfree( __in PCHAR Block ); |
| | |
| skipping to change at line 2253 | | skipping to change at line 2253 |
|---|
| // It allocates the output string from the LDAP memory pool. If the pDn | | // It allocates the output string from the LDAP memory pool. If the pDn |
| // comes back as non-NULL, you should free it when you're done with a call | | // comes back as non-NULL, you should free it when you're done with a call |
| // to ldap_memfree. | | // to ldap_memfree. |
| // | | // |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_ufn2dnW ( | | WINLDAPAPI ULONG LDAPAPI ldap_ufn2dnW ( |
| __in const PWCHAR ufn, | | __in const PWCHAR ufn, |
| __deref_out PWCHAR *pDn | | __deref_out PWCHAR *pDn |
| ); | | ); |
| WINLDAPAPI ULONG LDAPAPI ldap_ufn2dnA ( | | WINLDAPAPI ULONG LDAPAPI ldap_ufn2dnA ( |
|
| const PCHAR ufn, | | __in const PCHAR ufn, |
| PCHAR *pDn | | __deref_out PCHAR *pDn |
| ); | | ); |
| | |
| #if LDAP_UNICODE | | #if LDAP_UNICODE |
| | |
| #define ldap_ufn2dn ldap_ufn2dnW | | #define ldap_ufn2dn ldap_ufn2dnW |
| | |
| #else | | #else |
| | |
| WINLDAPAPI ULONG LDAPAPI ldap_ufn2dn ( | | WINLDAPAPI ULONG LDAPAPI ldap_ufn2dn ( |
| __in const PCHAR ufn, | | __in const PCHAR ufn, |
| | |
| End of changes. 29 change blocks. |
|---|
| 36 lines changed or deleted | | 36 lines changed or added |
|---|
|