From f6f8ec8d8bccee5eec05c7f546e306bced897bbb Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 6 Mar 2011 09:31:40 +0100 Subject: s3: Move EXOP definitions to smbldap.h This attempts to fix the build on Solaris Autobuild-User: Volker Lendecke Autobuild-Date: Sun Mar 6 10:45:16 CET 2011 on sn-devel-104 --- source3/passdb/pdb_ldap.c | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'source3/passdb/pdb_ldap.c') 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 #include -/* - * 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" -- cgit