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

diff --cc source3/Makefile.in
index 8723b4f63f3a20cd7b2bb669c6b83b8a88d34fe3,f1272559b74529c343b3250286aff9621df52677..abf6cfb5f7c76372be79e04886e6fa6b73045506
--- 1/source3/Makefile.in
--- 2/source3/Makefile.in
+++ b/source3/Makefile.in
@@@ -366,11 -366,12 +366,12 @@@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OB
          lib/substitute.o lib/dbwrap_util.o \
          lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \
          lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \
 -        lib/iconv.o lib/pam_errors.o intl/lang_tdb.o lib/conn_tdb.o \
 -        lib/adt_tree.o lib/gencache.o \
 +        ../lib/util/charset/iconv.o lib/pam_errors.o intl/lang_tdb.o \
 +        lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
          lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \
          lib/ldap_escape.o @CHARSET_STATIC@ \
-         lib/secdesc.o lib/util_seaccess.o lib/secace.o lib/secacl.o \
+         lib/secdesc.o lib/util_seaccess.o ../libcli/security/secace.o \
+         ../libcli/security/secacl.o \
          libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \
          lib/file_id.o lib/idmap_cache.o \
          ../libcli/security/dom_sid.o

diff --cc source3/include/proto.h
Simple merge

diff --cc source3/include/smb.h
Simple merge