sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

r134: - added ldb to the build of smbd

Browse Source 
- fixed build of the ldb registry backend
(This used to be commit 0b66590330)
This commit is contained in:
Andrew Tridgell
2004-04-09 08:06:39 +00:00
committed by Gerald (Jerry) Carter
parent 72daedbeb7
commit 42889e5e1e
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source4/Makefile.in
View File

@ -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

1
source4/configure.in
View File

@ -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)

1
source4/include/includes.h
View File

@ -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"

0
source4/lib/ldb/include/proto.h
View File

5
source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
View File

@ -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;;