mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
r1785: remove unneeded dependencies on openldap client libraries
This commit is contained in:
parent
250485b69f
commit
44083e3178
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user