[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-52-g1377f28

[Jelmer Vernooij]

The branch, master has been updated
       via  1377f28f85118b97b723da6636a865499774b448 (commit)
       via  f607ad2e9013bc52d409faf8e628b8c6092f7d61 (commit)
      from  076bb89028ea4d27a96492b2030d873b0d78ca24 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1377f28f85118b97b723da6636a865499774b448
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jan 21 18:20:23 2009 +0100

    Fix warning; base dn is no longer const.

commit f607ad2e9013bc52d409faf8e628b8c6092f7d61
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jan 21 18:07:41 2009 +0100

    Move check_python.m4 to common m4 directory.

-----------------------------------------------------------------------

Summary of changes:
 {source4/build/m4 => m4}/check_python.m4 |    0 
 source3/configure.in                     |    2 +-
 source3/lib/ldb/tools/ldbdel.c           |    4 ++--
 source4/build/m4/env.m4                  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename {source4/build/m4 => m4}/check_python.m4 (100%)


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/check_python.m4 b/m4/check_python.m4
similarity index 100%
rename from source4/build/m4/check_python.m4
rename to m4/check_python.m4
diff --git a/source3/configure.in b/source3/configure.in
index f100477..87b4c33 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6286,7 +6286,7 @@ m4_include(../lib/zlib/zlib.m4)
 
 if test x$enable_merged_build = xauto; then
 	# Check for python
-	m4_include(../source4/build/m4/check_python.m4)
+	m4_include(../m4/check_python.m4)
 	AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
 
 	AC_MSG_CHECKING([whether it would be possible to do a merged build])
diff --git a/source3/lib/ldb/tools/ldbdel.c b/source3/lib/ldb/tools/ldbdel.c
index cafe0bd..c58a82a 100644
--- a/source3/lib/ldb/tools/ldbdel.c
+++ b/source3/lib/ldb/tools/ldbdel.c
@@ -35,7 +35,7 @@
 #include "ldb/include/includes.h"
 #include "ldb/tools/cmdline.h"
 
-static int ldb_delete_recursive(struct ldb_context *ldb, const struct ldb_dn *dn)
+static int ldb_delete_recursive(struct ldb_context *ldb, struct ldb_dn *dn)
 {
 	int ret, i, total=0;
 	const char *attrs[] = { NULL };
@@ -90,7 +90,7 @@ int main(int argc, const char **argv)
 	}
 
 	for (i=0;i<options->argc;i++) {
-		const struct ldb_dn *dn;
+		struct ldb_dn *dn;
 
 		dn = ldb_dn_explode(ldb, options->argv[i]);
 		if (dn == NULL) {
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index a988dd0..738ab8b 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -73,7 +73,7 @@ AC_SUBST(automatic_dependencies)
 
 m4_include(build/m4/check_doc.m4)
 
-m4_include(build/m4/check_python.m4)
+m4_include(../m4/check_python.m4)
 
 AC_SAMBA_PYTHON_DEVEL([
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])


-- 
Samba Shared Repository