svn commit: samba r12595 - in branches/SAMBA_4_0/source/ldap_server: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-12-30 06:48:16 +0000 (Fri, 30 Dec 2005)
New Revision: 12595

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12595

Log:
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

Modified:
   branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c	2005-12-30 03:57:11 UTC (rev 12594)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c	2005-12-30 06:48:16 UTC (rev 12595)
@@ -59,22 +59,6 @@
 {
 	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);