diff options
| author | Volker Lendecke <vl@samba.org> | 2011-03-06 09:31:40 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-03-06 10:45:16 +0100 |
| commit | f6f8ec8d8bccee5eec05c7f546e306bced897bbb (patch) | |
| tree | 115c656ff632940b8507782665d78574163e2454 /source3 | |
| parent | a40bb91213a321ea08897d7152d9d64defa1a8b1 (diff) | |
| download | samba-f6f8ec8d8bccee5eec05c7f546e306bced897bbb.tar.gz samba-f6f8ec8d8bccee5eec05c7f546e306bced897bbb.tar.bz2 samba-f6f8ec8d8bccee5eec05c7f546e306bced897bbb.zip | |
s3: Move EXOP definitions to smbldap.h
This attempts to fix the build on Solaris
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sun Mar 6 10:45:16 CET 2011 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/smbldap.h | 25 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 25 |
2 files changed, 25 insertions, 25 deletions
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 2c69d5ef8a..3427ab54f6 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -297,4 +297,29 @@ struct ldapsam_privates; #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 /* _SMBLDAP_H */ diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 7eb2fef49a..d1bee87f60 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -55,31 +55,6 @@ #include <lber.h> #include <ldap.h> -/* - * 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 - #include "smbldap.h" |