r1785: remove unneeded dependencies on openldap client libraries

(This used to be commit 44083e317855f6d8a0b4a81002a3376e8775df28)

diff --git a/source4/include/ads.h b/source4/include/ads.h
index 27a2e41c524f353e9eb8f7318cfb0a34bc7fa5a2..71bca6eb711e422b38deccdb777ff13240bc1f0c 100644 (file)
--- a/source4/include/ads.h
+++ b/source4/include/ads.h
@@ -72,11 +72,7 @@ typedef struct {
        int minor_status;
 } ADS_STATUS;
 
-#ifdef HAVE_ADS
-typedef LDAPMod **ADS_MODLIST;
-#else
 typedef void **ADS_MODLIST;
-#endif
 
 /* macros to simplify error returning */
 #define ADS_ERROR(rc) ADS_ERROR_LDAP(rc)

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 3821269f2bb92ee2497c0c487a239fc3bd585de9..e13175ecb729c53abb002c8a7ac2671edd7fee6e 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -379,16 +379,6 @@
 #undef HAVE_KRB5
 #endif
 
-#if HAVE_LBER_H
-#include <lber.h>
-#endif
-
-#if HAVE_LDAP_H
-#include <ldap.h>
-#else
-#undef HAVE_LDAP
-#endif
-
 #if HAVE_GSSAPI_H
 #include <gssapi.h>
 #endif

diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index 63dd7d4c7be6d8e318d5208d6a39f3cb9fb45780..5afd595293c9d960eb0e075733c1c2f3b89abad5 100644 (file)
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -596,13 +596,13 @@ static BOOL fill_mods(struct ldap_message *msg, char **chunk)
                mod.attrib.name = talloc_strdup(msg->mem_ctx, value.data);
 
                if (strequal(attr_name, "add"))
-                       mod.type = LDAP_MOD_ADD;
+                       mod.type = LDAP_MODIFY_ADD;
 
                if (strequal(attr_name, "delete"))
-                       mod.type = LDAP_MOD_DELETE;
+                       mod.type = LDAP_MODIFY_DELETE;
 
                if (strequal(attr_name, "replace"))
-                       mod.type = LDAP_MOD_REPLACE;
+                       mod.type = LDAP_MODIFY_REPLACE;
 
                if (mod.type == LDAP_MODIFY_NONE) {
                        DEBUG(2, ("ldif modification type %s unsupported\n",
@@ -1537,6 +1537,7 @@ struct ldap_connection *new_ldap_connection(void)
        result->search_entries = NULL;
        result->auth_dn = NULL;
        result->simple_pw = NULL;
+
        return result;
 }