[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-1316-gca414d4
Stefan Metzmacher
metze at samba.org
Tue Mar 18 15:01:16 GMT 2008
The branch, v4-0-test has been updated
via ca414d4e9e96b90100c46b006825bc8e935ba0b4 (commit)
via 087667e0cd66ea615b5aa43538192fe1d7de87ae (commit)
via 91b49365abed6f67e2b3c18b0090b4e6ff1df935 (commit)
from 5f5fa368c2ca472409c0082400b6e26029dfd7b5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit ca414d4e9e96b90100c46b006825bc8e935ba0b4
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 18 14:31:49 2008 +0100
ldb: remove configure with 'make realdistclean'
configure.in doesn't exist at all...
metze
commit 087667e0cd66ea615b5aa43538192fe1d7de87ae
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 18 14:29:43 2008 +0100
ldb: nothing uses "system/network.h" so don't include it
metze
commit 91b49365abed6f67e2b3c18b0090b4e6ff1df935
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 18 14:29:13 2008 +0100
ldb: fix the standalone build
metze
-----------------------------------------------------------------------
Summary of changes:
source/lib/ldb/Makefile.in | 2 +-
source/lib/ldb/common/ldb.c | 2 +-
source/lib/ldb/common/ldb_modules.c | 10 +++++-----
source/lib/ldb/include/ldb_includes.h | 1 -
source/lib/ldb/include/ldb_private.h | 4 ++--
source/lib/ldb/ldb_ldap/ldb_ldap.c | 6 +++---
source/lib/ldb/tests/sample_module.c | 2 +-
source/lib/ldb/tests/test-soloading.sh | 2 +-
8 files changed, 14 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/ldb/Makefile.in b/source/lib/ldb/Makefile.in
index d88f82b..a53c554 100644
--- a/source/lib/ldb/Makefile.in
+++ b/source/lib/ldb/Makefile.in
@@ -121,7 +121,7 @@ distclean:: clean
rm -f Makefile
realdistclean:: distclean
- rm -f configure.in include/config.h.in
+ rm -f configure include/config.h.in
check:: test @PYTHON_CHECK_TARGET@
diff --git a/source/lib/ldb/common/ldb.c b/source/lib/ldb/common/ldb.c
index 3c9ef3f..b51c288 100644
--- a/source/lib/ldb/common/ldb.c
+++ b/source/lib/ldb/common/ldb.c
@@ -65,7 +65,7 @@ static struct backends_list_entry {
#ifdef HAVE_LDB_LDAP
#define LDAP_INIT &ldb_ldap_backend_ops, \
- &ldb_ildap_backend_ops, \
+ &ldb_ldapi_backend_ops, \
&ldb_ldaps_backend_ops,
#else
#define LDAP_INIT
diff --git a/source/lib/ldb/common/ldb_modules.c b/source/lib/ldb/common/ldb_modules.c
index 7da7b9b..34e0afb 100644
--- a/source/lib/ldb/common/ldb_modules.c
+++ b/source/lib/ldb/common/ldb_modules.c
@@ -129,11 +129,11 @@ static struct ops_list_entry {
#ifndef STATIC_LIBLDB_MODULES
#define STATIC_LIBLDB_MODULES \
- ldb_operational_module_ops, \
- ldb_rdn_name_module_ops, \
- ldb_paged_results_module_ops, \
- ldb_sort_module_ops, \
- ldb_asq_module_ops, \
+ &ldb_operational_module_ops, \
+ &ldb_rdn_name_module_ops, \
+ &ldb_paged_results_module_ops, \
+ &ldb_server_sort_module_ops, \
+ &ldb_asq_module_ops, \
NULL
#endif
diff --git a/source/lib/ldb/include/ldb_includes.h b/source/lib/ldb/include/ldb_includes.h
index e2bcca2..cc9b46a 100644
--- a/source/lib/ldb/include/ldb_includes.h
+++ b/source/lib/ldb/include/ldb_includes.h
@@ -18,7 +18,6 @@
#include "replace.h"
#include "system/filesys.h"
-#include "system/network.h"
#include "system/time.h"
#include "talloc.h"
#include "ldb.h"
diff --git a/source/lib/ldb/include/ldb_private.h b/source/lib/ldb/include/ldb_private.h
index d2dcc67..0ffba9d 100644
--- a/source/lib/ldb/include/ldb_private.h
+++ b/source/lib/ldb/include/ldb_private.h
@@ -185,7 +185,7 @@ extern const struct ldb_module_ops ldb_paged_results_module_ops;
extern const struct ldb_module_ops ldb_rdn_name_module_ops;
extern const struct ldb_module_ops ldb_schema_module_ops;
extern const struct ldb_module_ops ldb_asq_module_ops;
-extern const struct ldb_module_ops ldb_sort_module_ops;
+extern const struct ldb_module_ops ldb_server_sort_module_ops;
extern const struct ldb_module_ops ldb_ldap_module_ops;
extern const struct ldb_module_ops ldb_ildap_module_ops;
extern const struct ldb_module_ops ldb_tdb_module_ops;
@@ -194,7 +194,7 @@ extern const struct ldb_module_ops ldb_sqlite3_module_ops;
extern const struct ldb_backend_ops ldb_tdb_backend_ops;
extern const struct ldb_backend_ops ldb_sqlite3_backend_ops;
extern const struct ldb_backend_ops ldb_ldap_backend_ops;
-extern const struct ldb_backend_ops ldb_ildap_backend_ops;
+extern const struct ldb_backend_ops ldb_ldapi_backend_ops;
extern const struct ldb_backend_ops ldb_ldaps_backend_ops;
int ldb_match_msg(struct ldb_context *ldb,
diff --git a/source/lib/ldb/ldb_ldap/ldb_ldap.c b/source/lib/ldb/ldb_ldap/ldb_ldap.c
index 3f6ff3f..a4534c5 100644
--- a/source/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -826,17 +826,17 @@ failed:
return -1;
}
-_PUBLIC_ struct ldb_backend_ops ldb_ldap_backend_ops = {
+const struct ldb_backend_ops ldb_ldap_backend_ops = {
.name = "ldap",
.connect_fn = lldb_connect
};
-_PUBLIC_ struct ldb_backend_ops ldb_ldapi_backend_ops = {
+const struct ldb_backend_ops ldb_ldapi_backend_ops = {
.name = "ldapi",
.connect_fn = lldb_connect
};
-_PUBLIC_ struct ldb_backend_ops ldb_ldaps_backend_ops = {
+const struct ldb_backend_ops ldb_ldaps_backend_ops = {
.name = "ldaps",
.connect_fn = lldb_connect
};
diff --git a/source/lib/ldb/tests/sample_module.c b/source/lib/ldb/tests/sample_module.c
index 98d8e86..1a9e72c 100644
--- a/source/lib/ldb/tests/sample_module.c
+++ b/source/lib/ldb/tests/sample_module.c
@@ -32,7 +32,7 @@ int sample_add(struct ldb_module *mod, struct ldb_request *req)
return ldb_next_request(mod, req);
}
-_PUBLIC_ const struct ldb_module_ops ldb_sample_module_ops = {
+const struct ldb_module_ops ldb_sample_module_ops = {
.name = "sample",
.add = sample_add,
};
diff --git a/source/lib/ldb/tests/test-soloading.sh b/source/lib/ldb/tests/test-soloading.sh
index c42c9b2..da6d575 100755
--- a/source/lib/ldb/tests/test-soloading.sh
+++ b/source/lib/ldb/tests/test-soloading.sh
@@ -19,7 +19,7 @@ fi
cat <<EOF | $VALGRIND ldbadd || exit 1
dn: @MODULES
- at LIST: sample_module
+ at LIST: sample
EOF
cat <<EOF | $VALGRIND ldbadd || exit 1
--
Samba Shared Repository
More information about the samba-cvs
mailing list