svn commit: samba r1785 - in branches/SAMBA_4_0/source: include
libcli/ldap
idra at samba.org
idra at samba.org
Thu Aug 12 19:29:52 GMT 2004
Author: idra
Date: 2004-08-12 19:29:52 +0000 (Thu, 12 Aug 2004)
New Revision: 1785
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=1785&nolog=1
Log:
remove unneeded dependencies on openldap client libraries
Modified:
branches/SAMBA_4_0/source/include/ads.h
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/libcli/ldap/ldap.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/ads.h
===================================================================
--- branches/SAMBA_4_0/source/include/ads.h 2004-08-12 18:43:35 UTC (rev 1784)
+++ branches/SAMBA_4_0/source/include/ads.h 2004-08-12 19:29:52 UTC (rev 1785)
@@ -72,11 +72,7 @@
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)
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h 2004-08-12 18:43:35 UTC (rev 1784)
+++ branches/SAMBA_4_0/source/include/includes.h 2004-08-12 19:29:52 UTC (rev 1785)
@@ -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
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2004-08-12 18:43:35 UTC (rev 1784)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.c 2004-08-12 19:29:52 UTC (rev 1785)
@@ -596,13 +596,13 @@
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 @@
result->search_entries = NULL;
result->auth_dn = NULL;
result->simple_pw = NULL;
+
return result;
}
More information about the samba-cvs
mailing list