diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-03-09 17:39:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:56:49 -0500 |
| commit | 60823d1878563c398373ff2c761dd91a588af3b5 (patch) | |
| tree | ac4f0230228bda31747845db56cb41c87d15fc3c /source4 | |
| parent | 6500444a2d74c7d921e7300939f459a83b95ea14 (diff) | |
| download | samba-60823d1878563c398373ff2c761dd91a588af3b5.tar.gz samba-60823d1878563c398373ff2c761dd91a588af3b5.tar.bz2 samba-60823d1878563c398373ff2c761dd91a588af3b5.zip | |
r14078: move ldb_global_init() to the main smbd code,
to fix the process_model standard
metze
(This used to be commit a465126e15490c5605064eb2387fb589d312db7b)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 2 | ||||
| -rw-r--r-- | source4/nbt_server/wins/winsserver.c | 2 | ||||
| -rw-r--r-- | source4/smbd/server.c | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 247b877e1a..867f576827 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -548,8 +548,6 @@ static void ldapsrv_task_init(struct task_server *task) struct ldapsrv_service *ldap_service; NTSTATUS status; - ldb_global_init(); - ldap_service = talloc_zero(task, struct ldapsrv_service); if (ldap_service == NULL) goto failed; diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c index 62e152e05c..85ffd7bce5 100644 --- a/source4/nbt_server/wins/winsserver.c +++ b/source4/nbt_server/wins/winsserver.c @@ -841,8 +841,6 @@ NTSTATUS nbtd_winsserver_init(struct nbtd_server *nbtsrv) return NT_STATUS_OK; } - ldb_global_init(); - nbtsrv->winssrv = talloc_zero(nbtsrv, struct wins_server); NT_STATUS_HAVE_NO_MEMORY(nbtsrv->winssrv); diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 3036966f6a..057cdfd5e8 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -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,7 +226,9 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ 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? */ |