summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-12-10 22:22:54 +0100
committerBjörn Jacke <bj@sernet.de>2009-12-10 22:22:54 +0100
commite92b034d8a830e36a353b4c9dee64af2f1dadc00 (patch)
tree009d4bbfbfe814c16e236754be52d580b5b990b9
parent66836445a2d5fde1e82eae7fc2f6a6ee86a6c468 (diff)
downloadsamba-e92b034d8a830e36a353b4c9dee64af2f1dadc00.tar.gz
samba-e92b034d8a830e36a353b4c9dee64af2f1dadc00.tar.bz2
samba-e92b034d8a830e36a353b4c9dee64af2f1dadc00.zip
s3: make own defines for ldap deref types
there are too many naming clashes between different ldap libs and ldb libs. Let's simply make our own defines. The numbers are well standarized. This also makes the default for "ldap deref" be "default" which means we won't tell the ldap library what to do. Ѕo by default it's all up to what the server and our libs think they should to do.
-rw-r--r--source3/param/loadparm.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 38cad7c979..de31e91249 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -747,12 +747,18 @@ static const struct enum_list enum_ldap_ssl[] = {
{-1, NULL}
};
+/* LDAP Dereferencing Alias types */
+#define SAMBA_LDAP_DEREF_NEVER 0
+#define SAMBA_LDAP_DEREF_SEARCHING 1
+#define SAMBA_LDAP_DEREF_FINDING 2
+#define SAMBA_LDAP_DEREF_ALWAYS 3
+
static const struct enum_list enum_ldap_deref[] = {
- {LDAP_DEREFERENCE_NEVER, "never"},
- {LDAP_DEREFERENCE_SEARCHING, "searching"},
- {LDAP_DEREFERENCE_FINDING, "finding"},
- {LDAP_DEREFERENCE_ALWAYS, "always"},
- {-1, NULL}
+ {SAMBA_LDAP_DEREF_NEVER, "never"},
+ {SAMBA_LDAP_DEREF_SEARCHING, "searching"},
+ {SAMBA_LDAP_DEREF_FINDING, "finding"},
+ {SAMBA_LDAP_DEREF_ALWAYS, "always"},
+ {-1, "default"}
};
static const struct enum_list enum_ldap_passwd_sync[] = {
@@ -5082,7 +5088,7 @@ static void init_globals(bool first_time_only)
string_set(&Globals.szLdapAdminDn, "");
Globals.ldap_ssl = LDAP_SSL_START_TLS;
Globals.ldap_ssl_ads = False;
- Globals.ldap_deref = LDAP_DEREFERENCE_NEVER;
+ Globals.ldap_deref = -1;
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */