r134: - added ldb to the build of smbd

 - fixed build of the ldb registry backend
(This used to be commit 0b66590330603efaa816fd2348c05a994a1580ef)

diff --git a/source4/Makefile.in b/source4/Makefile.in
index 91216d11edae34ab5a7220e824eb4369db806e76..fdc87934d0dac4ccaec64b3a5c61d19f86d50f9a 100644 (file)
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -94,6 +94,8 @@ MODULES = $(CHARSET_MODULES) $(DCERPC_MODULES) $(NTVFS_MODULES)
 
 CHARSET_OBJS = @CHARSET_OBJS@
 
+LIBLDB_OBJS = @LIBLDB_OBJS@
+
 LIBBASIC_OBJS = @LIBBASIC_OBJS@
 LIBBASIC_LIBS = @LIBBASIC_LIBS@ $(LIBS)
 
@@ -166,7 +168,8 @@ SERVER_LIBS =
 
 SMBD_OBJS =    $(SERVER_OBJS) $(PROCESS_MODEL_OBJS) \
                $(DCERPC_OBJS) $(SMB_OBJS) $(AUTH_OBJS) $(PASSDB_OBJS) $(NTVFS_OBJS) \
-               $(LIBBASIC_OBJS) $(CONFIG_OBJS) $(LIBCMDLINE_OBJS) $(LIBSMB_OBJS)
+               $(LIBBASIC_OBJS) $(CONFIG_OBJS) $(LIBCMDLINE_OBJS) $(LIBSMB_OBJS) \
+               $(LIBLDB_OBJS)
 SMBD_LIBS =    $(SERVER_LIBS) $(PROCESS_MODEL_LIBS) \
                $(DCERPC_LIBS) $(SMB_LIBS) $(AUTH_LIBS) $(PASSDB_LIBS) $(NTVFS_LIBS) \
                $(LIBBASIC_LIBS) $(CONFIG_LIBS) $(LIBCMDLINE_LIBS) $(LIBSMB_LIBS)
@@ -201,7 +204,7 @@ REGDIFF_OBJ = $(REG_OBJS) lib/registry/tools/regdiff.o $(LIBBASIC_OBJS) $(CONFIG
 
 PROTO_OBJ =    $(SERVER_OBJS) $(PROCESS_MODEL_OBJS) $(CLIENT_OBJS) $(TORTURE_OBJS) \
                $(DCERPC_OBJS) $(SMB_OBJS) $(AUTH_OBJS) $(PASSDB_OBJS) $(NTVFS_OBJS) \
-               $(LIBBASIC_OBJS) $(CONFIG_OBJS) $(LIBCMDLINE_OBJS) $(LIBSMB_OBJS) $(REG_OBJS)
+               $(LIBBASIC_OBJS) $(LIBLDB_OBJS) $(CONFIG_OBJS) $(LIBCMDLINE_OBJS) $(LIBSMB_OBJS) $(REG_OBJS)
 
 
 ######################################################################
@@ -365,7 +368,7 @@ bin/regpatch@EXEEXT@: $(REGPATCH_OBJ) bin/.dummy
 bin/regdiff@EXEEXT@: $(REGDIFF_OBJ) bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(REGDIFF_OBJ) $(LDFLAGS) $(LIBS) $(REG_LIBS)
- 
+
 install: installbin installtorture installdat 
 
 # DESTDIR is used here to prevent packagers wasting their time

diff --git a/source4/configure.in b/source4/configure.in
index a35400588b668dfcaa189a994fa47e52da910708..a6639064a7236c5a1be96445643a82fc760e6271 100644 (file)
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -198,6 +198,7 @@ sinclude(nsswitch/config.m4)
 sinclude(lib/popt/config.m4)
 sinclude(lib/iconv.m4)
 sinclude(lib/basic.m4)
+sinclude(lib/ldb/config.m4)
 sinclude(lib/cmdline/config.m4)
 sinclude(param/config.m4)
 sinclude(libcli/config.m4)

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 3ea7d9549fb24dde3eb633711242a2043f3f42cf..be0f7baaf40c514cfcf80a11f73a2a87e66c7df2 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -679,6 +679,7 @@ extern int errno;
 /* Lists, trees, caching, database... */
 #include "xfile.h"
 #include "dlinklist.h"
+#include "lib/ldb/include/ldb.h"
 #include "lib/tdb/tdb.h"
 #include "lib/tdb/spinlock.h"
 #include "lib/tdb/tdbutil.h"

diff --git a/source4/lib/ldb/include/proto.h b/source4/lib/ldb/include/proto.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
index 3cc165151929c1d4106cff7d6a16e0613cdf4428..9e561b1e6c728dbd6d405e8b9efcc68caa0ab700 100644 (file)
--- a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
+++ b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "lib/registry/common/registry.h"
-#include "lib/ldb/include/ldb.h"
 
 char *reg_path_to_ldb(TALLOC_CTX *mem_ctx, const char *path)
 {
@@ -81,7 +80,7 @@ static WERROR ldb_fetch_subkeys(REG_KEY *k, int *count, REG_KEY ***subkeys)
                /* FIXME */
        }
 
-       ldap_search_free(c, msg);
+       ldb_search_free(c, msg);
        talloc_destroy(mem_ctx);
        return WERR_OK;
 }
@@ -103,7 +102,7 @@ static WERROR ldb_open_key(REG_HANDLE *h, const char *name, REG_KEY **key)
                /* FIXME */
        }
 
-       ldap_search_free(c, msg);
+       ldb_search_free(c, msg);
        talloc_destroy(mem_ctx);
 
        return WERR_OK;;