svn commit: samba r14078 - in branches/SAMBA_4_0/source: ldap_server nbt_server/wins smbd

metze at samba.org metze at samba.org
Thu Mar 9 17:39:24 GMT 2006


Author: metze
Date: 2006-03-09 17:39:24 +0000 (Thu, 09 Mar 2006)
New Revision: 14078

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

Log:
move ldb_global_init() to the main smbd code,
to fix the process_model standard

metze
Modified:
   branches/SAMBA_4_0/source/ldap_server/ldap_server.c
   branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
   branches/SAMBA_4_0/source/smbd/server.c


Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.c	2006-03-09 16:28:38 UTC (rev 14077)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.c	2006-03-09 17:39:24 UTC (rev 14078)
@@ -548,8 +548,6 @@
 	struct ldapsrv_service *ldap_service;
 	NTSTATUS status;
 
-	ldb_global_init();
-
 	ldap_service = talloc_zero(task, struct ldapsrv_service);
 	if (ldap_service == NULL) goto failed;
 

Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c	2006-03-09 16:28:38 UTC (rev 14077)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c	2006-03-09 17:39:24 UTC (rev 14078)
@@ -841,8 +841,6 @@
 		return NT_STATUS_OK;
 	}
 
-	ldb_global_init();
-
 	nbtsrv->winssrv = talloc_zero(nbtsrv, struct wins_server);
 	NT_STATUS_HAVE_NO_MEMORY(nbtsrv->winssrv);
 

Modified: branches/SAMBA_4_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/server.c	2006-03-09 16:28:38 UTC (rev 14077)
+++ branches/SAMBA_4_0/source/smbd/server.c	2006-03-09 17:39:24 UTC (rev 14078)
@@ -30,6 +30,7 @@
 #include "system/dir.h"
 #include "system/filesys.h"
 #include "build.h"
+#include "ldb/include/ldb.h"
 #include "registry/registry.h"
 #include "ntvfs/ntvfs.h"
 #include "ntptr/ntptr.h"
@@ -225,8 +226,10 @@
 		exit(1);
 	}
 
-	gensec_init();
+	ldb_global_init(); /* FIXME: */
 
+	gensec_init(); /* FIXME: */
+
 	registry_init(); /* FIXME: maybe run this in the initialization function 
 						of the winreg RPC server instead? */
 



More information about the samba-cvs mailing list