summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-06-16 13:43:38 +0200
committerAndreas Schneider <asn@samba.org>2010-06-16 14:07:28 +0200
commit6dbcffb51d979094cbdac80df5e9480475230137 (patch)
tree31a1405822da012949a811433981bb48dde26ca3 /source4/smbd
parent8843eea2e06736f27080eedab883ffc51feacb33 (diff)
downloadsamba-6dbcffb51d979094cbdac80df5e9480475230137.tar.gz
samba-6dbcffb51d979094cbdac80df5e9480475230137.tar.bz2
samba-6dbcffb51d979094cbdac80df5e9480475230137.zip
s4:lib: merge LDB_WRAP and LDBSAMBA and make LDBSAMBA a library.
This is needed to remove samba specifc symbols from the bundled ldb, in order to get the ABI right. metze Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/process_onefork.c2
-rw-r--r--source4/smbd/process_prefork.c2
-rw-r--r--source4/smbd/process_standard.c2
-rw-r--r--source4/smbd/wscript_build2
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/smbd/process_onefork.c b/source4/smbd/process_onefork.c
index d1688ec98a..b0e2e29bd6 100644
--- a/source4/smbd/process_onefork.c
+++ b/source4/smbd/process_onefork.c
@@ -31,7 +31,7 @@
#include "system/filesys.h"
#include "cluster/cluster.h"
#include "param/param.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
#ifdef HAVE_SETPROCTITLE
#ifdef HAVE_SETPROCTITLE_H
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c
index 7813189f19..fd1dc88fb1 100644
--- a/source4/smbd/process_prefork.c
+++ b/source4/smbd/process_prefork.c
@@ -31,7 +31,7 @@
#include "system/filesys.h"
#include "cluster/cluster.h"
#include "param/param.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
#ifdef HAVE_SETPROCTITLE
#ifdef HAVE_SETPROCTITLE_H
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index baa3136a53..6a7e8833eb 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -27,7 +27,7 @@
#include "system/filesys.h"
#include "cluster/cluster.h"
#include "param/param.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
#ifdef HAVE_SETPROCTITLE
#ifdef HAVE_SETPROCTITLE_H
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 68e75ca1da..217ef95128 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -39,7 +39,7 @@ bld.SAMBA_MODULE('process_model_standard',
source='process_standard.c',
subsystem='process_model',
init_function='process_model_standard_init',
- deps='LIBEVENTS SETPROCTITLE'
+ deps='LIBEVENTS SETPROCTITLE LDBSAMBA'
)