The branch, master has been updated
via 0245b9b97363f08786c25d4412ed293ca6f94cd5 (commit)
via 0498a30b223861a9ea10c75848387755ddedd411 (commit)
via de4f7c0787498ba0030b67a98a5361900775fca1 (commit)
via 7acea5a032e1c1fa14a5b414992d0f8f0a45a9f2 (commit)
from 8b7a1394aae8c59adb04a8cfc5e38ae0cb4462ab (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0245b9b97363f08786c25d4412ed293ca6f94cd5
Author: Simo Sorce <i...@samba.org>
Date: Fri Jan 30 20:12:16 2009 -0500
Explicitly include ldb_handlers.h where necessary
commit 0498a30b223861a9ea10c75848387755ddedd411
Author: Simo Sorce <i...@samba.org>
Date: Fri Jan 30 20:11:37 2009 -0500
Install mising public headers
commit de4f7c0787498ba0030b67a98a5361900775fca1
Author: Simo Sorce <i...@samba.org>
Date: Fri Jan 30 20:11:16 2009 -0500
Do not install private headers
commit 7acea5a032e1c1fa14a5b414992d0f8f0a45a9f2
Author: Simo Sorce <i...@samba.org>
Date: Fri Jan 30 20:10:45 2009 -0500
Fix proxy module
-----------------------------------------------------------------------
Summary of changes:
lib/tevent/tevent.mk | 2 --
source4/dsdb/samdb/ldb_modules/proxy.c | 4 ++--
source4/lib/ldb-samba/ldif_handlers.c | 1 +
source4/lib/ldb/Makefile.in | 2 +-
source4/lib/ldb/common/ldb_attributes.c | 1 +
source4/lib/ldb/include/ldb_private.h | 5 -----
6 files changed, 5 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
index be7e298..ac5710f 100644
--- a/lib/tevent/tevent.mk
+++ b/lib/tevent/tevent.mk
@@ -22,8 +22,6 @@ installdirs::
installheaders:: installdirs
cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
- cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir)
- cp $(srcdir)/tevent_util.h $(DESTDIR)$(includedir)
installlibs:: installdirs
cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c
b/source4/dsdb/samdb/ldb_modules/proxy.c
index 9a5091c..72b47c3 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -62,7 +62,7 @@ struct proxy_ctx {
*/
static int load_proxy_info(struct ldb_module *module)
{
- struct ldb = ldb_module_get_ctx(module);
+ struct ldb_context *ldb = ldb_module_get_ctx(module);
struct proxy_data *proxy =
talloc_get_type(ldb_module_get_private(module), struct proxy_data);
struct ldb_dn *dn;
struct ldb_result *res = NULL;
@@ -262,7 +262,7 @@ static int proxy_search_callback(struct ldb_request *req,
ac = talloc_get_type(req->context, struct proxy_ctx);
ldb = ldb_module_get_ctx(ac->module);
- proxy = talloc_get_type(private_data, struct proxy_data);
+ proxy = talloc_get_type(ldb_module_get_private(module), struct
proxy_data);
if (!ares) {
return ldb_module_done(ac->req, NULL, NULL,
diff --git a/source4/lib/ldb-samba/ldif_handlers.c
b/source4/lib/ldb-samba/ldif_handlers.c
index d92f211..13bb320 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/lib/ldb-samba/ldif_handlers.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "ldb_private.h"
+#include "ldb_handlers.h"
#include "dsdb/samdb/samdb.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/gen_ndr/ndr_misc.h"
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 6313fc1..7f00e8e 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -67,7 +67,7 @@ MDLD_FLAGS = @MDLD_FLAGS@
OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TEVENT_OBJ)
$(TALLOC_OBJ) $(POPT_OBJ) $(LDB_MAP_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ)
-headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h
$(srcdir)/include/ldb_handlers.h
+headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h
$(srcdir)/include/ldb_handlers.h $(srcdir)/include/ldb_includes.h
$(srcdir)/include/ldb_module.h
BINS = bin/ldbadd bin/ldbsearch bin/ldbdel bin/ldbmodify bin/ldbedit
bin/ldbrename bin/ldbtest
diff --git a/source4/lib/ldb/common/ldb_attributes.c
b/source4/lib/ldb/common/ldb_attributes.c
index 4d688a4..9fa0fb2 100644
--- a/source4/lib/ldb/common/ldb_attributes.c
+++ b/source4/lib/ldb/common/ldb_attributes.c
@@ -29,6 +29,7 @@
*/
#include "ldb_private.h"
+#include "ldb_handlers.h"
/*
add a attribute to the ldb_schema
diff --git a/source4/lib/ldb/include/ldb_private.h
b/source4/lib/ldb/include/ldb_private.h
index 2e65908..1ce9e9e 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -150,11 +150,6 @@ const char **ldb_subclass_list(struct ldb_context *ldb,
const char *classname);
void ldb_subclass_remove(struct ldb_context *ldb, const char *classname);
int ldb_subclass_add(struct ldb_context *ldb, const char *classname, const
char *subclass);
-int ldb_handler_copy(struct ldb_context *ldb, void *mem_ctx,
- const struct ldb_val *in, struct ldb_val *out);
-int ldb_comparison_binary(struct ldb_context *ldb, void *mem_ctx,
- const struct ldb_val *v1, const struct ldb_val *v2);
-
/* The following definitions come from lib/ldb/common/ldb_utf8.c */
char *ldb_casefold_default(void *context, void *mem_ctx, const char *s, size_t
n);
--
Samba Shared Repository
