summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-12-30 06:48:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:00 -0500
commitcca1daeab18e0d39861c9337938185804a2db645 (patch)
tree90612367c947884dcef9651aebe3de196ec8acfb
parent906c142423dde9518a49eaa4819011d99216c711 (diff)
downloadsamba-cca1daeab18e0d39861c9337938185804a2db645.tar.gz
samba-cca1daeab18e0d39861c9337938185804a2db645.tar.bz2
samba-cca1daeab18e0d39861c9337938185804a2db645.zip
r12595: There was no comment on the mailing list, so kill the 'ldapsrv:samdb'
parameter. It isn't useful with so many other things in the ldap server opening the database directly. Best to run this as a seperate process, and change the global options. Andrew Bartlett (This used to be commit 34d6220cec763eefa9313f5a39ce7a73b238f7f0)
-rw-r--r--source4/ldap_server/ldap_simple_ldb.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c
index a32cc3b5e0..806266b7a5 100644
--- a/source4/ldap_server/ldap_simple_ldb.c
+++ b/source4/ldap_server/ldap_simple_ldb.c
@@ -59,22 +59,6 @@ NTSTATUS sldb_Init(struct ldapsrv_partition *partition, struct ldapsrv_connectio
{
TALLOC_CTX *mem_ctx = talloc_new(partition);
struct ldb_context *ldb;
- const char *url;
- url = lp_parm_string(-1, "ldapsrv", "samdb");
- if (url) {
-
- ldb = ldb_wrap_connect(mem_ctx, url, conn->session_info,
- NULL, 0, NULL);
- if (ldb == NULL) {
- talloc_free(mem_ctx);
- return NT_STATUS_INTERNAL_DB_CORRUPTION;
- }
- talloc_steal(partition, ldb);
- partition->private = ldb;
- talloc_free(mem_ctx);
- return NT_STATUS_OK;
- }
-
ldb = samdb_connect(mem_ctx, conn->session_info);
if (ldb == NULL) {
talloc_free(mem_ctx);