summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2004-08-12 19:29:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:57:56 -0500
commit28ea8b8785e5e8e3b3f3ddf0c12c0c8c69ea77c5 (patch)
tree1952f8f9fa33bf385cde691d84a3f38b288f523a
parent425caa9b78e76d943988fcc53e1b2e38cdaa18be (diff)
downloadsamba-28ea8b8785e5e8e3b3f3ddf0c12c0c8c69ea77c5.tar.gz
samba-28ea8b8785e5e8e3b3f3ddf0c12c0c8c69ea77c5.tar.bz2
samba-28ea8b8785e5e8e3b3f3ddf0c12c0c8c69ea77c5.zip
r1785: remove unneeded dependencies on openldap client libraries
(This used to be commit 44083e317855f6d8a0b4a81002a3376e8775df28)
-rw-r--r--source4/include/ads.h4
-rw-r--r--source4/include/includes.h10
-rw-r--r--source4/libcli/ldap/ldap.c7
3 files changed, 4 insertions, 17 deletions
diff --git a/source4/include/ads.h b/source4/include/ads.h
index 27a2e41c52..71bca6eb71 100644
--- 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 3821269f2b..e13175ecb7 100644
--- 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 63dd7d4c7b..5afd595293 100644
--- 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;
}