[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-1098-g1cd7fe7
Simo Sorce
idra at samba.org
Mon Feb 23 22:39:10 GMT 2009
The branch, master has been updated
via 1cd7fe71940b7420dd478321b8368a31ae713917 (commit)
from cf7539abfb0f6e6956bed7a478e0cda6ab734674 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1cd7fe71940b7420dd478321b8368a31ae713917
Author: Simo Sorce <idra at samba.org>
Date: Mon Feb 23 17:35:49 2009 -0500
Fix headers, ldb_includes.h is a private header,
do not reference it from ldb.h
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/config.mk | 4 ++--
source4/dsdb/samdb/ldb_modules/linked_attributes.c | 1 +
source4/dsdb/samdb/ldb_modules/objectclass.c | 1 +
source4/dsdb/samdb/ldb_modules/ranged_results.c | 1 +
source4/dsdb/samdb/ldb_modules/samba3sam.c | 2 +-
source4/dsdb/samdb/ldb_modules/update_keytab.c | 1 +
source4/dsdb/schema/schema_set.c | 1 +
source4/lib/ldb/Makefile.in | 2 +-
source4/lib/ldb/common/ldb_modules.c | 5 +----
source4/lib/ldb/include/ldb.h | 14 +++++++++++++-
source4/lib/ldb/include/ldb_includes.h | 9 ---------
source4/lib/ldb/include/ldb_private.h | 5 +----
source4/lib/ldb/ldb_ildap/ldb_ildap.c | 3 +--
source4/lib/ldb/ldb_ldap/ldb_ldap.c | 1 +
source4/lib/ldb/ldb_map/ldb_map.c | 2 --
source4/lib/ldb/ldb_map/ldb_map.h | 2 ++
source4/lib/ldb/ldb_map/ldb_map_inbound.c | 2 --
source4/lib/ldb/ldb_map/ldb_map_outbound.c | 2 --
source4/lib/ldb/ldb_map/ldb_map_private.h | 1 +
source4/lib/ldb/ldb_tdb/ldb_index.c | 1 +
source4/lib/ldb/ldb_tdb/ldb_tdb.h | 8 +-------
source4/lib/ldb/modules/operational.c | 5 +++++
source4/lib/ldb/modules/paged_results.c | 1 +
source4/lib/ldb/modules/rdn_name.c | 1 +
source4/lib/ldb/tools/cmdline.c | 1 +
source4/lib/ldb/tools/ldbedit.c | 2 +-
source4/lib/ldb/tools/ldbsearch.c | 1 +
source4/lib/ldb/tools/ldbtest.c | 1 +
28 files changed, 42 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index 01f5188..583d1dc 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -89,7 +89,7 @@ ldb_samldb_OBJ_FILES = \
[MODULE::ldb_samba3sam]
SUBSYSTEM = LIBLDB
INIT_FUNCTION = LDB_MODULE(samba3sam)
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS SMBPASSWD \
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB SMBPASSWD \
NSS_WRAPPER LIBSECURITY NDR_SECURITY
# End MODULE ldb_samldb
################################################
@@ -102,7 +102,7 @@ ldb_samba3sam_OBJ_FILES = \
[MODULE::ldb_simple_ldap_map]
SUBSYSTEM = LIBLDB
INIT_FUNCTION = LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBNDR
+PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB LIBNDR
ENABLE = YES
ALIASES = entryuuid nsuniqueid
# End MODULE ldb_entryuuid
diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index 2365a58..4e28c8a 100644
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -30,6 +30,7 @@
#include "includes.h"
#include "ldb_module.h"
+#include "dlinklist.h"
#include "dsdb/samdb/samdb.h"
struct la_op_store {
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 0261bb3..898d913 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -35,6 +35,7 @@
#include "includes.h"
#include "ldb_module.h"
+#include "dlinklist.h"
#include "dsdb/samdb/samdb.h"
#include "librpc/ndr/libndr.h"
#include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/dsdb/samdb/ldb_modules/ranged_results.c b/source4/dsdb/samdb/ldb_modules/ranged_results.c
index 8f36baa..5ce69a2 100644
--- a/source4/dsdb/samdb/ldb_modules/ranged_results.c
+++ b/source4/dsdb/samdb/ldb_modules/ranged_results.c
@@ -29,6 +29,7 @@
* Author: Andrew Bartlett
*/
+#include "includes.h"
#include "ldb_module.h"
struct rr_context {
diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c
index 3f10748..59cb9de 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c
@@ -6,7 +6,7 @@
*/
#include "includes.h"
-#include "ldb/include/ldb_module.h"
+#include "ldb_module.h"
#include "ldb/ldb_map/ldb_map.h"
#include "system/passwd.h"
diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index 8920afe..f1b6863 100644
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -29,6 +29,7 @@
#include "includes.h"
#include "ldb_module.h"
+#include "dlinklist.h"
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
#include "system/kerberos.h"
diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index d6b3e40..6abd8a8 100644
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "dlinklist.h"
#include "dsdb/samdb/samdb.h"
#include "lib/ldb/include/ldb_module.h"
#include "param/param.h"
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 7f00e8e..663dea9 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 $(srcdir)/include/ldb_includes.h $(srcdir)/include/ldb_module.h
+headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h $(srcdir)/include/ldb_handlers.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_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 99a4776..ae97ef4 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -32,10 +32,7 @@
*/
#include "ldb_private.h"
-
-#if (_SAMBA_BUILD_ >= 4)
-#include "includes.h"
-#endif
+#include "dlinklist.h"
#define LDB_MODULE_PREFIX "modules:"
#define LDB_MODULE_PREFIX_LEN 8
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 6990397..eb8e0ed 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -46,7 +46,19 @@
#define _LDB_H_ 1
/*! \endcond */
-#include "ldb_includes.h"
+#ifndef bool
+typedef int bool;
+#endif
+#ifndef true
+#define true 1
+#endif
+#ifndef false
+#define false 0
+#endif
+
+#include "talloc.h"
+#include "tevent.h"
+#include "ldb_errors.h"
/*
major restrictions as compared to normal LDAP:
diff --git a/source4/lib/ldb/include/ldb_includes.h b/source4/lib/ldb/include/ldb_includes.h
index a292713..602bbec 100644
--- a/source4/lib/ldb/include/ldb_includes.h
+++ b/source4/lib/ldb/include/ldb_includes.h
@@ -4,11 +4,6 @@
a temporary includes file until I work on the ldb build system
*/
-#if (_SAMBA_BUILD_ >= 4)
-/* tell ldb we have the internal ldap code */
-#define HAVE_ILDAP 1
-#endif
-
#if (_SAMBA_BUILD_ <= 3)
/* allow forbidden string functions - should be replaced with _m functions */
#undef strcasecmp
@@ -19,9 +14,5 @@
#include "replace.h"
#include "system/filesys.h"
#include "system/time.h"
-#include <talloc.h>
-#include <tevent.h>
-#include "ldb_errors.h"
-#include "dlinklist.h"
#endif /*_LDB_PRIVATE_INCLUDES_H_*/
diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h
index 1ce9e9e..2e8da99 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -37,6 +37,7 @@
#ifndef _LDB_PRIVATE_H_
#define _LDB_PRIVATE_H_ 1
+#include "ldb_includes.h"
#include "ldb.h"
#include "ldb_module.h"
@@ -109,10 +110,6 @@ struct ldb_context {
struct tevent_context *ev_ctx;
};
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
-#endif
-
/* The following definitions come from lib/ldb/common/ldb.c */
int ldb_connect_backend(struct ldb_context *ldb, const char *url, const char *options[],
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index b134405..4447d0e 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -40,11 +40,10 @@
* author: Simo Sorce
*/
-
#include "includes.h"
#include "ldb_module.h"
+#include "dlinklist.h"
-#include "tevent.h"
#include "libcli/ldap/ldap.h"
#include "libcli/ldap/ldap_client.h"
#include "auth/auth.h"
diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
index e1fcdb1..43a01f7 100644
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -38,6 +38,7 @@
* author: Simo Sorce
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
#define LDAP_DEPRECATED 1
diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c
index ea2bfd1..9595403 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/ldb_map/ldb_map.c
@@ -35,8 +35,6 @@
* Author: Jelmer Vernooij, Martin Kuehl
*/
-#include "ldb_module.h"
-
#include "ldb_map.h"
#include "ldb_map_private.h"
diff --git a/source4/lib/ldb/ldb_map/ldb_map.h b/source4/lib/ldb/ldb_map/ldb_map.h
index 8722081..3c1fe80 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.h
+++ b/source4/lib/ldb/ldb_map/ldb_map.h
@@ -26,6 +26,8 @@
#ifndef __LDB_MAP_H__
#define __LDB_MAP_H__
+#include "ldb_module.h"
+
/* ldb_map is a skeleton LDB module that can be used for any other modules
* that need to map attributes.
*
diff --git a/source4/lib/ldb/ldb_map/ldb_map_inbound.c b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
index e915a5f..822dea6 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_inbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
@@ -24,8 +24,6 @@
*/
-#include "ldb_module.h"
-
#include "ldb_map.h"
#include "ldb_map_private.h"
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
index 327fa92..eb7b459 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -25,8 +25,6 @@
*/
-#include "ldb_module.h"
-
#include "ldb_map.h"
#include "ldb_map_private.h"
diff --git a/source4/lib/ldb/ldb_map/ldb_map_private.h b/source4/lib/ldb/ldb_map/ldb_map_private.h
index 0c46443..612d215 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_private.h
+++ b/source4/lib/ldb/ldb_map/ldb_map_private.h
@@ -1,3 +1,4 @@
+#include "ldb_includes.h"
/* A handy macro to report Out of Memory conditions */
#define map_oom(module) ldb_set_errstring(ldb_module_get_ctx(module), talloc_asprintf(module, "Out of Memory"));
diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index cdbef39..ad27c9a 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -32,6 +32,7 @@
*/
#include "ldb_tdb.h"
+#include "dlinklist.h"
/*
the idxptr code is a bit unusual. The way it works is to replace
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index 7ebf199..0a06cdb 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -1,11 +1,5 @@
-#if (_SAMBA_BUILD_ == 3)
-#include "tdb/include/tdb.h"
-#else
-#include "replace.h"
-#include "system/wait.h"
+#include "ldb_includes.h"
#include "tdb.h"
-#endif
-
#include "ldb_module.h"
/* this private structure is used by the ltdb backend in the
diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c
index d862638..43b223b 100644
--- a/source4/lib/ldb/modules/operational.c
+++ b/source4/lib/ldb/modules/operational.c
@@ -73,8 +73,13 @@
modifiersName: not supported by w2k3?
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
+#endif
+
/*
construct a canonical name from a message
*/
diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index 7d7cdf6..2a06c5e 100644
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -32,6 +32,7 @@
* Author: Simo Sorce
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
struct message_store {
diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index a5ffcc0..880678d 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -36,6 +36,7 @@
* Simo Sorce Mar 2006
*/
+#include "ldb_includes.h"
#include "ldb_module.h"
struct rename_context {
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 3dce9b1..2701de5 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -21,6 +21,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "ldb_includes.h"
#include "ldb.h"
#include "tools/cmdline.h"
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index 3a915f8..9d3bd27 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -30,7 +30,7 @@
*
* Author: Andrew Tridgell
*/
-
+#include "ldb_includes.h"
#include "ldb.h"
#include "tools/cmdline.h"
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 35d4ac7..ba0a2a8 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb.h"
#include "tools/cmdline.h"
diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index edaa9fb..6af0ee9 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -31,6 +31,7 @@
* Author: Andrew Tridgell
*/
+#include "ldb_includes.h"
#include "ldb.h"
#include "tools/cmdline.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list