diff options
| author | Günther Deschner <gd@samba.org> | 2011-11-16 18:59:26 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-11-17 02:11:46 +0100 |
| commit | f9df88eca7b9cdd2dda5bbd8700072a28e151b86 (patch) | |
| tree | adc1410fdd7234797593db5957e657b5b286d124 /source3/include/smb_ldap.h | |
| parent | 7d71747897b9b7c0119796ea874b464d73b00de8 (diff) | |
| download | samba-f9df88eca7b9cdd2dda5bbd8700072a28e151b86.tar.gz samba-f9df88eca7b9cdd2dda5bbd8700072a28e151b86.tar.bz2 samba-f9df88eca7b9cdd2dda5bbd8700072a28e151b86.zip | |
s3-smbldap: improve smbldap.h readability and rearrange some defines.
Guenther
Diffstat (limited to 'source3/include/smb_ldap.h')
| -rw-r--r-- | source3/include/smb_ldap.h | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/source3/include/smb_ldap.h b/source3/include/smb_ldap.h index 594f015862..6d15b1a6a2 100644 --- a/source3/include/smb_ldap.h +++ b/source3/include/smb_ldap.h @@ -88,4 +88,35 @@ struct ldapsam_privates; #define LDAP_OPT_SUCCESS 0 #endif +#define LDAP_DEFAULT_TIMEOUT 15 +#define LDAP_CONNECTION_DEFAULT_TIMEOUT 2 +#define LDAP_PAGE_SIZE 1024 + +#define ADS_PAGE_CTL_OID "1.2.840.113556.1.4.319" + +/* + * Work around versions of the LDAP client libs that don't have the OIDs + * defined, or have them defined under the old name. + * This functionality is really a factor of the server, not the client + * + */ + +#if defined(LDAP_EXOP_X_MODIFY_PASSWD) && !defined(LDAP_EXOP_MODIFY_PASSWD) +#define LDAP_EXOP_MODIFY_PASSWD LDAP_EXOP_X_MODIFY_PASSWD +#elif !defined(LDAP_EXOP_MODIFY_PASSWD) +#define LDAP_EXOP_MODIFY_PASSWD "1.3.6.1.4.1.4203.1.11.1" +#endif + +#if defined(LDAP_EXOP_X_MODIFY_PASSWD_ID) && !defined(LDAP_EXOP_MODIFY_PASSWD_ID) +#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID LDAP_EXOP_X_MODIFY_PASSWD_ID +#elif !defined(LDAP_EXOP_MODIFY_PASSWD_ID) +#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID ((ber_tag_t) 0x80U) +#endif + +#if defined(LDAP_EXOP_X_MODIFY_PASSWD_NEW) && !defined(LDAP_EXOP_MODIFY_PASSWD_NEW) +#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW LDAP_EXOP_X_MODIFY_PASSWD_NEW +#elif !defined(LDAP_EXOP_MODIFY_PASSWD_NEW) +#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ((ber_tag_t) 0x82U) +#endif + #endif /* _SMB_LDAP_H */ |