Merge upstream.

diff --cc .gitignore
index 5af84e15c7fd49db13f34c592641ed2fa9c9d155,1ad2e2501f5458a96b8a91cd0e43fec48a9f80b1..a3a5bbe79c7a186efd463f846cf29f0909415e6f
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -187,28 -189,9 +187,31 @@@ source/dsdb/schema/proto.
  source/lib/crypto/test_proto.h
  source/lib/registry/tests/proto.h
  source/lib/util/apidocs
- source/lib/util/util_ldb.h
- source/libcli/ldap/ldap_ndr.h
  source/libcli/resolve/lp_proto.h
 +debian/stamp-patched
 +configure-stamp
 +build-stamp
 +debian/libgensec-dev
 +debian/libgensec0
 +debian/libparse-pidl-perl
 +debian/libsamba0
 +debian/samba-clients
 +debian/samba-common
 +debian/samba-ldb-tools
 +debian/samba
 +debian/samba
 +debian/swat
 +debian/tmp
 +debian/winregistry-tools
 +debian/libsamba-dev
 +debian/libsamba-dev
 +debian/samba-testsuite
 +debian/*.debhelper
 +debian/*.substvars
 +debian/files
 +debian/samba-dev
+ source/apidocs
+ *.swp
+ source/mkconfig.mk
+ source/data.mk
+ source/librpc/idl-deps

diff --cc source/lib/ldb/ldb_wrap.c
Simple merge