[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-161-gebe5b28

[Andrew Bartlett]

The branch, master has been updated
       via  ebe5b2835331ab259dd32bf6dc574ae999e2d36d (commit)
       via  5a10d804919af205b027ee519b9fa05519913ebe (commit)
       via  92bb91a6115ac035e3c37e471931c2a388dc843e (commit)
      from  f85aa66ca22f29734bdacaa559737990fbe28d8a (commit)

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


- Log -----------------------------------------------------------------
commit ebe5b2835331ab259dd32bf6dc574ae999e2d36d
Merge: 5a10d804919af205b027ee519b9fa05519913ebe f85aa66ca22f29734bdacaa559737990fbe28d8a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Mar 5 11:11:19 2009 +1100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel

commit 5a10d804919af205b027ee519b9fa05519913ebe
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Mar 5 11:07:35 2009 +1100

    Remove parse_control from header, long after the function was removed
    
    Simo reminded me that when (long ago) I moved parse_controls away from
    this place, I forgot to update the manually maintained header file.
    
    Andrew Bartlett

commit 92bb91a6115ac035e3c37e471931c2a388dc843e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Mar 5 10:46:46 2009 +1100

    Update talloc version so we don't fail on system talloc 1.2.0
    
    The problem is that talloc in the Samba tree now includes
    talloc_get_type_abort(), which is not present on Fedora 10 or ubuntu's
    talloc 1.2.0.
    
    Andrew Bartlett

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

Summary of changes:
 lib/talloc/configure.ac         |    2 +-
 source4/configure.ac            |    2 +-
 source4/lib/ldb/tools/cmdline.h |    1 -
 3 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac
index d2538f9..39cea39 100644
--- a/lib/talloc/configure.ac
+++ b/lib/talloc/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT(talloc, 1.2.0)
+AC_INIT(talloc, 1.2.1)
 AC_CONFIG_SRCDIR([talloc.c])
 AC_SUBST(datarootdir)
 AC_CONFIG_HEADER(config.h)
diff --git a/source4/configure.ac b/source4/configure.ac
index 54ca910..d33df08 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -42,7 +42,7 @@ AC_CONFIG_FILES(param/samba-hostconfig.pc)
 AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
 AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
 
-SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0, [],
+SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.1, [],
 	[
 		m4_include(../lib/talloc/libtalloc.m4)
 		SMB_INCLUDE_MK(../lib/talloc/config.mk)
diff --git a/source4/lib/ldb/tools/cmdline.h b/source4/lib/ldb/tools/cmdline.h
index 3473d62..45619ce 100644
--- a/source4/lib/ldb/tools/cmdline.h
+++ b/source4/lib/ldb/tools/cmdline.h
@@ -50,5 +50,4 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
 					void (*usage)(void));
 
 
-struct ldb_control **parse_controls(void *mem_ctx, char **control_strings);
 int handle_controls_reply(struct ldb_control **reply, struct ldb_control **request);


-- 
Samba Shared Repository