Merge branch 'master' of git://git.samba.org/samba

Conflicts:
	lib/util/asn1_proto.h

diff --combined lib/util/config.mk
index f564efbe61401411119378641fd2898bb532a293,0eaabbf86b64bd473515699042e4aea572cdecc1..61e193b0c413e1fdb1c54c70ab4f6364f439d822
--- 1/lib/util/config.mk
--- 2/lib/util/config.mk
+++ b/lib/util/config.mk
@@@ -26,6 -26,7 +26,7 @@@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $
                idtree.o \
                become_daemon.o \
                rbtree.o \
+               talloc_stack.o \
                params.o)
  
  PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
@@@ -43,6 -44,8 +44,6 @@@
  
  ASN1_UTIL_OBJ_FILES = $(libutilsrcdir)/asn1.o
  
 -$(eval $(call proto_header_template,$(libutilsrcdir)/asn1_proto.h,$(ASN1_UTIL_OBJ_FILES:.o=.c)))
 -
  [SUBSYSTEM::UNIX_PRIVS]
  
  UNIX_PRIVS_OBJ_FILES = $(libutilsrcdir)/unix_privs.o