diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-04-09 08:06:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:10 -0500 |
| commit | 42889e5e1e276c8957cc666991364c6f0b6bdc79 (patch) | |
| tree | 0441dc1741dbbb56997dc80f8ea6b7fb9f59ba95 /source4 | |
| parent | 72daedbeb7aff1731468ed773c34d52cddbbe039 (diff) | |
| download | samba-42889e5e1e276c8957cc666991364c6f0b6bdc79.tar.gz samba-42889e5e1e276c8957cc666991364c6f0b6bdc79.tar.bz2 samba-42889e5e1e276c8957cc666991364c6f0b6bdc79.zip | |
r134: - added ldb to the build of smbd
- fixed build of the ldb registry backend
(This used to be commit 0b66590330603efaa816fd2348c05a994a1580ef)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/Makefile.in | 9 | ||||
| -rw-r--r-- | source4/configure.in | 1 | ||||
| -rw-r--r-- | source4/include/includes.h | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/include/proto.h | 0 | ||||
| -rw-r--r-- | source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c | 5 |
5 files changed, 10 insertions, 6 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index 91216d11ed..fdc87934d0 100644 --- 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 a35400588b..a6639064a7 100644 --- 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 3ea7d9549f..be0f7baaf4 100644 --- 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 index e69de29bb2..0000000000 --- a/source4/lib/ldb/include/proto.h +++ /dev/null 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 3cc1651519..9e561b1e6c 100644 --- 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;; |