WHATSNEW: Fix date.

Karolin
(cherry picked from commit 30e30abc392c17d16a44eca73e5e4c3f7cda2199)

WHATSNEW: Update release notes.

Karolin
(cherry picked from commit 21b0bc2449ca30c3ad5570c794b4f56cd243996d)

WHATSNEW: Update release notes.

I know that it's not 100% complete, but I think it's good
enough to ship (that's even better than delaying again).

Karolin
(cherry picked from commit d4a25642fc1c26245c297c60356fe923fe2a316e)

s3:WHATSNEW: mention Gregor's "net idmap check" tool
(cherry picked from commit 9ffc2a90167518fd9de43bf801170012d0842b74)

s3: Retry the join with the short name

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit feb3cdee366a439e8526f439714c9068068cdaa4)
(cherry picked from commit 710988c69c98736aeab1174dbf46b5ab3d053d33)

s3: Initialize output in libnet_Join

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit da5e5a6a83a6dcf04c51497f8b5f10621d7b47f7)
(cherry picked from commit 691299cc72ca5897cae7f130c518e5ddc1ebeb40)

s3: For net ads join, create a krb5.conf

Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Apr 12 14:10:05 CEST 2011 on sn-devel-104
(cherry picked from commit 4edc98eb9e18eff00bb5ce9bdcdffa5b11149dd4)
(cherry picked from commit 4787c32934d885bd0084359a28c33b30bb523124)

s3-util: separate out cmdline helpers.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Apr 12 13:06:27 CEST 2011 on sn-devel-104
(cherry picked from commit 7de5b2002d853947bc66fa4dc96773a788dc5248)

s3: add some forward declarations.

Guenther
(cherry picked from commit 9c6f78aae195c286818f91405b983b127ae17402)
(cherry picked from commit 897ccdcae91ff4b3a61e6349dd0f7b8ed1ec6fac)

s3-netapi: use dcerpc_try_samr_connects().

Guenther
(cherry picked from commit 7ea03840fc817b21d7d333aebc6bbaeded9a0485)
(cherry picked from commit 3904e1dbe459ed660201204dcea350982aa0401a)

s3-netapi: use libnetapi_get_binding_handle().

Guenther
(cherry picked from commit 3acd6bde58ecd68faf8200268cc674a71c57778d)
(cherry picked from commit 1256f75645753830a396d25fdd968843ac58ce0f)

s3-netapi: add libnetapi_get_binding_handle().

Guenther
(cherry picked from commit 0eece6202c94fdd180f266049e1a3712b9477dc6)
(cherry picked from commit 710b40b5ac731cabb73608577af98e666b13214f)

s3-librpc: let librpc/rpc/dcerpc.h include ndr and generated dcerpc headers.

Guenther
(cherry picked from commit f10274806196cbea8d27cc2b1f1fe5087a2ede2b)
(cherry picked from commit 7937e6c9cd112b4f47215168e52d1cbf74786732)

s3-rpc_client: move rpc_cli_transport structs and protos to rpc_transport.h

Guenther
(cherry picked from commit 64b664155b16b0995af7cc87f54c613350127f9e)
(cherry picked from commit a35c24c9a47f947abc992c14c809403e6aa5aa07)

talloc/testsuite: avoid memory leak reported by valgrind

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Apr  8 10:15:41 CEST 2011 on sn-devel-104
(cherry picked from commit eb0e276f3a3b57405cd8cd36c74021350aba9a98)
(cherry picked from commit 6215a7bc8ef7268d6034785b4d887c40475e715e)

talloc/testsuite: test more talloc_pool related things

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit f9fdef870e4c49d9e6c23ba085ba6dbd34ec5469)
(cherry picked from commit 722da3df0f59c1ba5d90b598f94bf17a950715a8)

talloc: include valgrind headers if available

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 2146ffd764499d67e3f0576a2e78a1575cd52d9c)
(cherry picked from commit fb84f773cf7c74152caeea5d361e9604deeb353b)

talloc: add TC_INVALIDATE_POOL marco

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 73cc85ac903387f2c7f8ef2d948b40b57887cf17)
(cherry picked from commit 1d11631906efe7b81a237bee73925a032d5d4318)

talloc: add TC_UNDEFINE_GROW_CHUNK() marco

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 9c9f208598d34d700bfc2ed7302b206e863a4c9b)
(cherry picked from commit 046dfa2b6807838e787cdcef5eef28f9b660e961)

talloc: add TC_INVALIDATE_SHRINK_CHUNK() marco

This invalidates the unused bytes if we shrink memory.

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 6126c3506d493cd4836a7539586b74faea8ca0b3)
(cherry picked from commit 31578b94db5f9517ee344260e83362c547511549)

talloc: add TC_INVALIDATE_FULL_CHUNK() macro

This makes it easier to mark a talloc pointer as
invalid.

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 4895f55f0604a1851d45c24a8a584a10170d5917)
(cherry picked from commit 81a3c26aa1af783bb3a37a0991d9962cd71fc92f)

talloc: use VALGRIND_MAKE_MEM_UNDEFINED() before memmove()

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit efbb35824e3845c3cdefea328dd1bf67d0f9087d)
(cherry picked from commit a21ffe7d5b9a8ec8dae0fe5f123ba4add585821a)

talloc: optimize talloc_free() and talloc_realloc() for talloc pools

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 1e70439f770181ca16a0749c2164d0237d3bfd0a)
(cherry picked from commit 6fedf4bfb3251278bff8ef22a879aac8c89e75d5)

talloc: add TC_POOL_FIRST_CHUNK() macro

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 73330f8436707b5ab46c0720ea735908948f5d27)
(cherry picked from commit cf12120f98aaab15406654e6acbaf3377a8d0c04)

talloc: add TC_POOL_SPACE_LEFT() macro

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 13fab67995a0b836b92847536768703dac391b57)
(cherry picked from commit dbb450e2651c2b4e837eb5a2db78d702d0fcc1bf)

talloc: add TC_ALIGN16() macro

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit 4084cb723c4e14898a411fbd1cf8fa878ff290ff)
(cherry picked from commit 3947608d20d725fd56e51d1dac15b08aa2ad8267)

talloc: use TC_HDR_SIZE instead of sizeof(struct talloc_chunk)

As this includes the padding to 16 bytes.

metze

Signed-off-By: Andrew Tridgell <tridge@samba.org>
(cherry picked from commit d39940113a24078bd563b0cfce4225648c632544)
(cherry picked from commit c4a4e0943139bdfb183d5000117f383878b11e5d)

s3-printing: Use become_user_by_session() function.

We create a fake connection here and don't have an vuid. So work with
the session_info directly here.

Signed-off-by: Jeremy Allison <jra@samba.org>
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Apr 11 22:56:12 CEST 2011 on sn-devel-104
(cherry picked from commit e3c3b4daa425fede17203b474fa35493afbda2a9)
(cherry picked from commit 9ac8a582e51ff6949bebeec49f9f6c2627d48fc7)

s3-smbd: Added a become_user_by_session() function.

This uses the provided session_info instead of searching the user via
the vuid. This is useful to work with fake connnection you need to
create if someone connects directly to a rpc service.

Signed-off-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit b137156acbf7c39c86f306100cccc65b441a3209)
(cherry picked from commit 71885207ea6453f75d383a0265c73195df048dbf)

s3-smbd: Added a change_to_user_by_session() function.

Signed-off-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 27cb378283f2cf072151f1c624837741f40c298a)
(cherry picked from commit fe0882c896030dad91d8fda85a4ed031c68ae1ed)

s3: Wrap creating the svcctl keys in a transaction

This makes the startup of smbd in make test much quicker and thus more reliable
(cherry picked from commit f1aa38b414e97d8687d0bebf65baa384f75301b4)

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Apr 11 22:09:58 CEST 2011 on sn-devel-104
(cherry picked from commit d1ded271b6e8f8ff7f09c4830411e389d26b1b10)
(cherry picked from commit 4dc58230b1a411a207cb84251e8ffe6d14c9742e)

s3: Make reg_backend_db.h includable by itself
(cherry picked from commit 6ba31d3bd29dd11b1b98859f4d8a65d9be7dac60)
(cherry picked from commit a5495e70cc5f7659ab94d8570195edf3bd41072b)
(cherry picked from commit 59ed52d8ab9521466e9f25118336b9e9c42d2344)

WHATSNEW: Start to add changes since 3.6.0pre1.

To be completed...

Karolin
(cherry picked from commit 84b726154ef5cdcb00cbfbf7bc3ae607d6857765)

s3: Fix Coverity ID 2472, UNINIT

Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Apr 11 17:14:35 CEST 2011 on sn-devel-104
(cherry picked from commit 5cd6d93fa1f24b64b449455da40d5c83a18a8cff)
(cherry picked from commit 5a64930c2fee729e13f61ae0cef1a4f88a49e5c2)

s3: Fix Coverity ID 2473, UNINIT

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit d2d1d173237906f77b68b3d04add007e92fe2d34)
(cherry picked from commit 7b87f84d8e71348811433291f8263a6c66bf87ff)

s3: Fix timeout calculation in event_add_to_poll_args

In the initial phase nmbd does not yet have timed events. This led to nmbd
not correctly registering its names in make test and certainly everywhere
else.

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Apr 11 14:35:45 CEST 2011 on sn-devel-104
(cherry picked from commit 09586950225e880bbd6d9e147c884c5886c4d0a4)
(cherry picked from commit 246657b06e518674129abc7f0c141c3e85d9cc8b)

s3-modules: Fix debug message

Print child descriptor instead of parent.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Apr 11 11:48:42 CEST 2011 on sn-devel-104
(cherry picked from commit e6cf92c574fba14132757f141d8b1242fa71be88)
(cherry picked from commit 42ad7630259829f1c40d9d0fcf5376fa007568a3)

release-scripts/create-tarball: also remove the toplevel configure.developer

metze
(cherry picked from commit 7f14129570fe5c61c8eae9550e725e924cb12db4)

VERSION: Adapt version string.

Karolin

Merge remote branch 'origin/v3-6-test' into v3-6-stable

Karolin

create-tarball: Remove toplevel Makefile and configure.

Karolin

create-tarball: Use full path.

Make usage of rm consistent.

Karolin

VERSION: Raise version up to 3.6.0pre2.

Karolin

Fix bug 8072 - PANIC: create_file_acl_common frees handle two times.

Caused by premature optimisation storing the parent ACL on the
module handle instead of (correctly) on the file fsp. Previous
code wasn't reentrant safe. This is less optimal but doesn't
crash in the specific case :-).

Jeremy.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Apr  9 02:05:15 CEST 2011 on sn-devel-104
(cherry picked from commit af45636166c7a0cb87630105d18ce489e7391525)

Subtle change. Microsoft SMB2 tests return different access mask than for SMB1 with raw.acls.
(cherry picked from commit c6c17242d23cd03acd5adc29969177881a7d04e1)

s3:net idmap check: fix output of an invalid record

Only print the value number for hwm, version and seqnum keys.

Pair-Programmed-With: Gregor Beck <gbeck@sernet.de>

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Apr  8 17:29:31 CEST 2011 on sn-devel-104

s3-net: "idmap check" ignore __db_sequence_number__

Signed-off-by: Michael Adam <obnox@samba.org>

s3:net rpc trust: fix two C++ implicit void * cast warnings

s3:passdb:pdb_ipa: fix a C++ implicit void * cast warnings

s3:net idmap check: fix a couple of c++ implicit void * cast warnings

packaging(RHEL-CTDB): fix configure.rpm (honour additional cmdline parameters)

WHATSNEW: Fix typos.

Karolin

s4-smbtorture: fix lsa forest trust test.

lsa_lsaRSetForestTrustInformation takes a policy handle obtained from
lsaopenpolicy/lsaopenpolicy2 and not a trusted domain handle
(MS-LSAD 3.1.4.7.16 LsarSetForestTrustInformation (Opnum 74)).

Sumit, please check.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Apr  7 14:52:52 CEST 2011 on sn-devel-104
(cherry picked from commit ead6faab2766b786e124f2086093ef3fa05d115b)

lsa: use lsa_TrustedAccessMask in some more places in the lsa IDL.

Guenther
(cherry picked from commit 26d67846d47d5d1be54d1a8b045f5293a4a02839)

s3-net: document "idmap check"

Signed-off-by: Michael Adam <obnox@samba.org>

s3-net: fix the usage output of "net idmap check"

Signed-off-by: Michael Adam <obnox@samba.org>

Fix bug 6966 - "allow trusted domains = no" not respected in winbind.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Apr  6 23:37:27 CEST 2011 on sn-devel-104
(cherry picked from commit 2db094fc32687dc2a869d753b50b2aa1636cdbd6)

docs: fix the missing parameter description section in the smb.conf manpage

The smb.conf (5) manpage recently sometimes failed to contain the
contents of the description of each parameter section. The reason
was a unreliable chain of dependencies in the Makefile.

The error can be reproduced by touching manpages-3/smb.conf.5.xml
and then building the manpages.
Then smb.conf.5.xml is newer than any of the smbdotconf/*/*.xml
files and hence the intermediate inexistent parameters.*.xml
don't get generated.

This patch fixes this problem by introducing a phony "parameters"
target referencing the parameters.*.xml targets, so that they
get build unconditionally.

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Apr  6 01:22:00 CEST 2011 on sn-devel-104

packaging(RHEL-CTDB): Fix debuginfo builds

At least on RHEL 5.5, we observed broken debuginfo packages
when either old build directories were still present or old
debuginfo packages (of samba) were installed.

This patch removes the debuginfo samba RPMs and old RPM build
directories, giving the user a 10 second chance to quit.

packaging(RHEL-CTDB): add BuildRequires to ctdb-devel >= 1.2.25

This should make sure we build against ctdb with SCHEDULE_FOR_DELETION control.

packaging(RHEL-CTDB): replace Prereq by Requires.

In RHEL6, Prereq is deprecated.

s3: Fix tldap_make_mod_blob_int() debug messages

Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Apr  6 13:10:30 CEST 2011 on sn-devel-104
(cherry picked from commit 3626579cc27cb03fba2100be1a2686651bd3f003)

s3-net: Add delete op for net trust utility

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 2bafb4ccbb99dfde533acad7bf0162ca2618c716)

s3-net: Add net trust utility

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 11c342724fe23ef532063a7731c2a6d19614cf78)

s3-pdb_ipa: Create DN for new object

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 6681e451c98cd1716b5a68a02e0840a7ae768c36)

s3-pdb_ipa: Add ipasam_create_dom_group()

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 1cbe59e174c3ea66dfb57ab7f4ea493168b4867e)

s3-net: add IPA provision

Signed-off-by: Günther Deschner <gd@samba.org>

s3-pdb_ipa: Add ipasam_create_user()

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 2ee1d09f33a1076549e1d331ba23a31384aae150)

s3-pdb_ipa: Detect IPA server

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit c47df017dda71f9eecea74575c7d7292e543e5ec)

s3-pdb_ipa: Use new smbldap_make_mod_blob() without a return value

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit ca22befb9c2f4bf96944fc70650435dc11b4ea3a)

s3-smbldap: make octet_strings/DATA_BLOBs const.

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit f3b1a68f5f540fa3674c5594ad3ede1568bab6cb)

s3-smbldap: support storing octet_strings/DATA_BLOBs.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit c4974eec01d32f2c777aa3fca02210bb6c255d79)

s3-ipasam: rename of smbldap_make_mod_blob to _smbldap_make_mod_blob.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 02c6940964f8db0c7e78b9e6d8e4a7a404331285)

s3-pdb_ipa: Fix indentation

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit db76adc308217e92ada425703cbdbfce289d009b)

s3/vfs_gpfs: s/syncops/gpfs

as pointed out by Metze in bug #8031

Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Tue Apr  5 18:08:42 CEST 2011 on sn-devel-104
(cherry picked from commit dca465fa53f4d16cdce1353685b11010aa8ff0c7)

s3-net: fix the build of utils/net_idmap_check.c on a variety of platforms.

Gregor, please check.

Guenther

Fix bug #7080 - Quota only shown when logged as root.

Remove the final incorrect uses of conn->session_info->utok.uid.
When we're in the "admin users" list, then this value is not set
to zero.

Inspired by the comment on this bug by Dmitry Butskoy <dmitry@butskoy.name>.

I'll create a different fix for 3.5.x.

Jeremy.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Apr  5 21:53:59 CEST 2011 on sn-devel-104
(cherry picked from commit b6a30be70266c07733ddfa2ae08d127e08560868)

s3-libndr: add ../librpc/ndr/libndr.h include in some places.

Guenther
(cherry picked from commit a730dff78318a0bfe8c6b2b8a2cefed63cc586e8)

s3-vfs: try to fix build of aio_fork module.

Guenther
(cherry picked from commit 3800bae260ed3998317ce5e492a8f0a42fb2fd5f)

s3-smbd: try to fix the irix build.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Mar 30 17:17:58 CEST 2011 on sn-devel-104
(cherry picked from commit 220db5aad629451d24fcf678a5aa2f3637bc5eeb)

s3-vfs acl modules: more non-linux build fixes.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Mar 30 16:00:02 CEST 2011 on sn-devel-104
(cherry picked from commit 53bdf43acab2f8808fb205a719ff6323543a6440)

s3-passdb: move LOOKUP_NAME_ flags to passdb where they belong to.

Guenther
(cherry picked from commit 33082d016ee27537af0514d5eebcdaf0360fa4f7)

s3-passdb: move some passdb defines to passdb.h

Guenther
(cherry picked from commit 3253d5ad0515198083b0b185c06b659fc6972830)

s3-proto: pure cosmetics, remove some generated comments.

Guenther
(cherry picked from commit c8ed33ae9c26a63fd8adffa2041fe46a2542f0ba)

s3-winbind: try to fix the build on hosts w/o winbind support.

Guenther
(cherry picked from commit 6206156465b32aa565a1f7fbabfc62d668985d68)

s3-vfs_solarisacl: try to fix the solaris build.

Guenther
(cherry picked from commit b09b694dddfa4284b2c92d289694013e48b1e3f6)

s3: try to fix the build on some non-linux buildfarm machines.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Mar 30 11:39:31 CEST 2011 on sn-devel-104
(cherry picked from commit fbd0ff69ec07c55a2858f49b1effb40bd871d4a6)

s3-rpc_server: move access check functions out of samr server.

Guenther
(cherry picked from commit ab9a29eb638143a93f70bb7880ca24f73bbb2118)

s3: only include ntioctl.h where needed.

Guenther
(cherry picked from commit b1e3b9d7c118b5ba5260525e87796a98a5037144)

s3: only include lib/privileges.h where needed.

This finally removes the global lsa.h inclusion.

Guenther
(cherry picked from commit c2d6260f1042313ecb7540dd6ced1470db3001e9)

s3: include ../librpc/gen_ndr/lsa.h where needed.

Guenther
(cherry picked from commit 643b08dd25f9b1891b55d6653d0b04403d9b8ea0)

s3-passdb: move lsa_dom_info and lsa_name_info out of smb.h into passdb.

Guenther
(cherry picked from commit 1d383daf399b08c3833e55d11135796e34cc2689)

s3-includes: only include ntdomain.h where needed.

Guenther
(cherry picked from commit 6e3f0d28a4c0bc79cdbe4cfb50d105c4fe479d2b)

pidl: add an include for "ntdomain.h" for s3 server stubs.

Guenther
(cherry picked from commit 9115615663edf82afde5a3c934b53d53a0e508f0)

s3-messages: make ndr_messaging.h part of messages.h.

Guenther
(cherry picked from commit ab36d597e75286cca09abd75c67d8072c0ff64cf)

s3-messages: only include messages.h where needed.

Guenther
(cherry picked from commit b2af281e508194d9548ea1119c19ee96a0dd1f0a)

s3-prototyes: user_in_netgroup and user_in_list moved to auth, out of smbd.

Guenther
(cherry picked from commit 4bd5f51c43147b74203711764390727bdda17a77)

s3-includes: finally remove global include of auth.h.

Guenther
(cherry picked from commit 3679c0b8c101f9652858ea74a71556cdcdc88cb3)

s3-auth: vfs modules need auth.h

Guenther
(cherry picked from commit bd471d30047e7053a0accf8b7a3caf0472d06486)

s3-auth: printing needs auth.h

Guenther
(cherry picked from commit 3061f44fc9f6cf5b532cd59598d166e52c8cef36)