Merge from 3.0:

>Make pdb_ldap.c compile with SUN iPlanet headers. Whether this works will be
>tested soon, but this fix is somewhat obvious.
>
>Volker

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index d4de6b2e96d524e33ae6d1a25d92f23400e14dd8..5cf1691f0dd0c1ddeeda08b89d3bfd939af098e9 100644 (file)
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -61,7 +61,7 @@
 #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 "1.3.6.1.4.1.4203.1.11.1"
+#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)