WHATSNEW: Update changes since rc3.

Karolin
(cherry picked from commit 76022256cd23cd71354e21384e2350c761e9f373)

s3:modules:nfs4_acls: improve fix for bug #8330

simplify the check insmbacl4_find_equal_special()

Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit d1ab64cbc2d62744f541eea0d80d7b522416ac1c)

s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken

we should not merge ACEs with different flags (e.g. CI/OI/I/)
Otherwise ACLs get wrong entries and thus wrong semantics

Example:
ACL:BUILTIN\Users:ALLOWED/0x0/FULL
ACL:BUILTIN\Users:ALLOWED/I/READ
got merged to
ACL:BUILTIN\Users:ALLOWED/I/FULL

This is not the same and also leads to wrong displays
in the Windows ACL dialog

Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Wed Jul 27 16:03:51 CEST 2011 on sn-devel-104
(cherry picked from commit 3c05013694c453411b78a1df884a80c8d48e7393)

s3:lib/events: Fix a bug in run_poll_events().

Ignore fd events without EVENT_FD_READ or EVENT_FD_WRITE also in
run_events_poll(). They are ignore when building the array
for the syscall in event_add_to_poll_args(), so we need to
ignore them run_events_poll() too.

metze

Signed-off-by: Andreas Schneider <asn@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Aug  9 10:11:54 CEST 2011 on sn-devel-104
(cherry picked from commit 020032e114c0e966acf24f24e707942219d60cf3)

Fix bug #8358 (smbd exits with NT_STATUS_INTERNAL_ERROR in run_poll_events()).
(cherry picked from commit 6a587c926b7fdcb934b916a29bdd04bd0ef606b9)

s3:smb2_server: make sure we grant credits on async read/write operations (bug #8357)

Currently we skip, the "gone async" interim response on read and write,
this caused the aio code path to grant 0 credits to the client
in the read/write responses.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sun Aug  7 22:23:57 CEST 2011 on sn-devel-104
(cherry picked from commit 47bffb9b9243dc72d7305cd9ec3e63e176841bf5)
(cherry picked from commit cbd408df89ec51fb06fbfb935458eb8425639bed)

s3/swat: use strlcat instead of strncat to fix build on old Linux distros

SLES 9's glibc for example had weird macros where the use of strncat resulted
in the use of strcat which we don't allow.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Thu Aug  4 17:50:24 CEST 2011 on sn-devel-104
(cherry picked from commit d3b4d75364210e2d2a4a1cd806f28b0021f22909)

Fix bug #8362 (build issue on old glibc systems).
(cherry picked from commit 87fa72a5202fe3780d4a61289bf755027cd078f4)

s3:web/swat: use strtoll() instead of atoi/atol/atoll

This is more portable, as we have a strtoll replacement
in lib/replace.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sat Aug  6 11:55:45 CEST 2011 on sn-devel-104
(cherry picked from commit a6be0820d09b3f3eabfbb5f4356add303aa8a494)

Fix bug #8347 (CVE-2011-2522 regression for HP-UX, AIX and OSF).
(cherry picked from commit be41d88e55237214e5a27f7bd8d8c15e27d31579)

WHATSNEW: Update release notes.

Karolin
(cherry picked from commit d6f841bb3e465e7f05a886eafcb54f8d53b54327)

s3: Fix smb2 handling error returns from aio

Found when reading with aio_fork beyond the end of file.

Metze, Jeremy, please check!

Without this we get

[2011/08/02 21:02:54.082661,  0] lib/util.c:778(smb_panic_s3)
  PANIC (pid 2302): smbd/smb2_read.c:593: Type mismatch: name[NULL] expected[struct smbd_smb2_read_state]
[2011/08/02 21:02:54.094316,  0] lib/util.c:882(log_stack_trace)
  BACKTRACE: 23 stack frames:
   #0 bin/smbd(log_stack_trace+0x2d) [0xb72873d8]
   #1 bin/smbd(smb_panic_s3+0x7c) [0xb7287529]
   #2 bin/smbd(smb_panic+0x2f) [0xb7277e1f]
   #3 /root/git/s3-work/source3/bin/libtalloc.so.2 [0xb6c6bc48]
   #4 /root/git/s3-work/source3/bin/libtalloc.so.2 [0xb6c6ec79]
   #5 /root/git/s3-work/source3/bin/libtalloc.so.2(_talloc_get_type_abort+0x34) [0xb6c6ecb3]
   #6 bin/smbd [0xb6fbc405]
   #7 bin/smbd(_tevent_req_notify_callback+0x4a) [0xb729a85a]
   #8 bin/smbd [0xb729a888]
   #9 bin/smbd(_tevent_req_done+0x19) [0xb729aa73]
   #10 bin/smbd [0xb6fae517]
   #11 bin/smbd [0xb6fad258]
   #12 bin/smbd(smbd_aio_complete_aio_ex+0xf5) [0xb6fad6e8]
   #13 /root/git/inst/modules/vfs/aio_fork.so [0xb66d4992]
   #14 bin/smbd(run_events_poll+0x400) [0xb7297df2]
   #15 bin/smbd(smbd_process+0xd75) [0xb6f9d3a7]
   #16 bin/smbd [0xb756f07b]
   #17 bin/smbd(run_events_poll+0x400) [0xb7297df2]
   #18 bin/smbd [0xb7298254]
   #19 bin/smbd(_tevent_loop_once+0x9e) [0xb72986ac]
   #20 bin/smbd(main+0x185c) [0xb7570e59]
   #21 /lib/i686/cmov/libc.so.6(__libc_start_main+0xe5) [0xb6b08455]
   #22 bin/smbd [0xb6f14e01]

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Aug  2 22:33:15 CEST 2011 on sn-devel-104
(cherry picked from commit 5068a0d14df8cc6f1b4517c64f4356abc6606b58)

Fix bug #8343 (SMB2 crash reading with aio_fork beyond the end of file).
(cherry picked from commit ad75107a33ff7e70d9939b80b3e7e06265ee030e)

Fix bug 7462 - Non-standard SA_RESETHAND is used in ...lib/tevent/tevent_signal.c

Make SA_RESETHAND conditional on its existance.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Aug  1 22:03:45 CEST 2011 on sn-devel-104
(cherry picked from commit 0c67efdd68b9808542c090b9fd9920e4e37d85d0)
(cherry picked from commit 4b4155c7235d8ec0c93324a782bc815ef08a7ba3)

Fix bug #8341 - libsmbclient segfault when feed the root of a mounted share via an uri

Fix null deref.
(cherry picked from commit cf0c36ab9a5129878b92a52d22aa814eaa737a4c)
(cherry picked from commit ca293af1f06891dfd13171d418047e4fa8c4fc14)

s3: dbwrap_ctdb.c: Fix bug #8303 #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue

Check for HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL instead of
CTDB_CONTROL_SCHEDULE_FOR_DELETION, which is an enum member and not a
define.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jul 12 18:56:30 CEST 2011 on sn-devel-104
(cherry picked from commit b807c58b655f1ffbf849f5de9eef66136bdb4a52)
(cherry picked from commit 3932178dd3a54723484e833cddf58ff68e7c3417)

Second part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id

Modify the credit granting algorithm to closer to what I believe
Windows does.

Split up max_credits into 1/16ths, and then scale
the requested credits by how many 16ths have been
currently granted. Less than 1/16th == grant all
requested (100%), scale down as more have been
granted. Never ask for less than 1 if the client
asked for at least 1.
(cherry picked from commit 3e854564315a7bdc5d9837526a813b2b858e0563)

First part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id

Set default max credits to 8192 now this has been documented in the
SMB2 spec.
(cherry picked from commit 9d579ed2398d7f88c9c02076e612eed877d1ec88)

s3:loadparm: fix the reload of the configuration: also reload activated registry shares

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 22 16:53:49 CEST 2011 on sn-devel-104
(cherry picked from commit efbe1602bd014eada4811f336bdccbf4692d3807)

The last 2 patches address bug 8327 (config reload fails to reload shares from
registry).
(cherry picked from commit 254cc7ae23f2b0108bada37b6b59dd90ac198469)

s3:loadparm: add reload_registry_shares() - reload only those shares already loaded (cherry picked from commit ec113a58a4dc4e4f3ea03f7818eb312325f69482)
(cherry picked from commit cc3c8d10940ef5d5d0e636b0f9d46606d46b0dc7)

nbt: fix WinXP S3 domain join: alignment of nbt_netlogon_response_from_pdc

This fixes WinXP joining a Samba3 domain, which was broken on hosts
with an even number of characters in the host name.  The alignment
requested in the structure was ignored because of the overall
NDR_NOALIGN set on the packet.

Andrew Bartlett

Fix bug #8326 (WinXP cannot join a Samba3 domain with a 'even' hostname).
(cherry picked from commit 24fe5fea8fb7839dcbcf39a346a31c9e90e7beb9)

Fix bug #8324 - smbclient cannot list directories from a big-endian machine.

Two uses of the setup array are not being correctly byte-swapped to little
endian.
(cherry picked from commit 146549d7250fefb365675154f0916c37e56faa5d)

s3:torture: remove a file accidentially committed with 3b2fe4728d6d916508b677e696ecad88f8b7b9fd

Fix bug #8329 (a code file was accidentially commited).
(cherry picked from commit 0f9a24b7dc9aaae6145ec409191fc16b07c601a8)

s3:idmap_tdb2: remove the undocumented option of the silly name "tdb:idmap2.tdb"

In ancient times, when ctdb had not support for persistent databases and
tdb2 was introduced as a two-layer solution and it was more important than
today to be able to change the location of the permanent database file
because it had to reside on shared storage.

But these were times when idmap_tdb2 was not even officially released.
Nowadays, with ctdb handling the persistent idmap2.tdb database, the path
is stripped anyways, so this undocumented option has become unnecessary
and is hence removed.

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Jul 27 05:37:57 CEST 2011 on sn-devel-104
(cherry picked from commit 3276060da4e7d495bd5cf5cbf7237e64d948ee77)

The last 10 patches address
bug #8328 (final cleanup of idmap_tdb2 code and docs needed for release).
(cherry picked from commit 742b8c3c14ec8708eb5bfe5e7960c1c93ec0096c)

s3:idmap_tdb2: remove a legacy comment (cherry picked from commit 67cd2f9d867fad1f7df2d6a6a5cdb723336ac495)
(cherry picked from commit 55019ced08d235a3ba9ae27b06379fcb827f9b28)

s3:idmap_tdb2: remove legacy comment (cherry picked from commit 4b5ada3d27198b49771acb70ae979087235be783)
(cherry picked from commit 4369aeb41c2fafd6a1e0baff5cbb05d223e869ab)

s3:idmap_tdb2: remove superfluous initialization with bogus comment (cherry picked from commit 551185573899b6e608863f833633d40ae04458d8)
(cherry picked from commit 5a5b069166d5f224526f6cae049fa14cf35c426a)

s3:idmap_tdb2: fix a legacy comment that does not apply any more (cherry picked from commit 7d3dc2164b3929c642127659593e69fc865a6184)
(cherry picked from commit 7f56b6269792300237193b69541f73fb32a986b3)

s3:doc: add an example with idmap script to the idmap_tdb2 manpage (cherry picked from commit 86973eee43605a3680fb51470a81ea9ca7f1b515)
(cherry picked from commit 2abe73e5eed10af4ee030449322ddbc4c7054c08)

s3:docs: remove legacy text from the example in the idmap_tdb2 manpage (cherry picked from commit 2f253c2791ccb2421f26f563e3983ee950da1d05)
(cherry picked from commit 66216f6325f33c2a1d7c3e114754efc78d61aae2)

s3:doc: clarify the idmap script section in the idmap_tdb2 manpage (cherry picked from commit 4daab85ae60f2821a1d9d98f1edff6a318e8e3c1)
(cherry picked from commit 29e39194aaa15c44178b16a4abc5583f5ff4688f)

s3:docs:idmap_tdb2: update the documentation of idmap script

to reflect the new variant "idmap config * : script" of configuring the idmap script
(cherry picked from commit 2aa19b4aeb9de43a0e2b94ad1202f2068b29c710)
(cherry picked from commit 22b9dc3f66c6786a962d7cb462b372fb955a199e)

s3:idmap_tdb2: deprecate the idmap:script parameter and use "idmap config * : script" instead

With this patch, "idmap config * : script" will override "idmap : script".
If "idmap : script" is present, a deprecation warning will be printed in any
case. If "idmap config * : script" is not set, then the value of "idmap :script"
will be used for backwards compatibility.
(cherry picked from commit b6c82f18f17cdded771d285930566c1d104686aa)
(cherry picked from commit 7812ce547973a0ad5a69c64e8e708e1b9f3a8687)

WHATSNEW: Start release notes for 3.6.0.

Karolin
(cherry picked from commit 5f9bc1433738002acd9a93946955494908af9c05)

VERSION: Bump version up to 3.6.0.

Karolin
(cherry picked from commit ef152f60c2be5b51c042979ad29596309059af1d)

WHATSNEW: Update changes since rc2.

Karolin
(cherry picked from commit 1a045c461ec74001596e9ccf8a676328216e547f)

s3:utils/net_afs fix compiler warnings

this also fixes the usage displays of net afs
(cherry picked from commit 7738d8b89bcf2b43d65f1bf4599a688cb4143768)

s3:lib/afs fix the build with --with-vfs-afsacl

This fixes the second piece of Bug #8263
(cherry picked from commit 8a14ccb99388e31b366fc84060186be1ea708d75)

s3:lib/afs fix the build with --with-fake-kaserver

This fixes one piece of Bug #8263
(cherry picked from commit caa4226c315a70138016cf8fae13ce3f050057e7)

Fix bug 8314] - smbd crash with unknown user.

All other auth modules code with being called with
auth_method->private_data being NULL, make the auth_server
module cope with this too.
(cherry picked from commit e173f04a822944e96171866d9fbf43301cd611a4)

s3 swat: Create random nonce in CGI mode

In CGI mode, we don't get access to the user's password, which would
reduce the hash used so far to parameters an attacker can easily guess.
To work around this, read the nonce from secrets.tdb or generate one if
it's not there.
Also populate the C_user field so we can use that for token creation.

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 589bc35590aebfdd20fe786c08005bb43ef47d94)

s3 swat: Add time component to XSRF token

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit fb0d393a1972c28ecd6e49959c8c5b7900e1b574)

s3 swat: Add XSRF protection to printer page

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 3b138403ea157f1c6b8dfc40016f293831765948)

s3 swat: Add XSRF protection to password page

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 395503b9f51445d9ca493c2fc7e6022ee75cb743)

s3 swat: Add XSRF protection to shares page

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 869590cc3a0c09e11f77277af1d3b7334b718ce0)

s3 swat: Add XSRF protection to globals page

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit dc3aa10bbc5936aebab88db2ea34b46648839745)

s3 swat: Add XSRF protection to wizard page

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit e33970f1c60451a063bb2eeb64f9515c64722508)

s3 swat: Add XSRF protection to wizard_params page

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit a887d8446bc74b255682a4047cb5616fe236bcaf)

s3 swat: Add XSRF protection to viewconfig page

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit bb9bb437fc3685879f5b34c444d58c4a564f148d)

s3 swat: Add XSRF protection to status page

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit d240094fbe7b581a6c97f506fa17747e21180598)

s3 swat: Add support for anti-XSRF token

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 5e32110742a310aff6946acd34b0dca3a3fc8130)

s3 swat: Allow getting the user's HTTP auth password

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 4592956a35d700aaf4ec2be7fc183f42fbe14fba)

s3-swat: Fix typo.

Thanks to Simo for reporting!

Karolin
(cherry picked from commit 9f73c1990a19daa899fa5345530a867e69a5be94)
(cherry picked from commit bcb052c29212954a3ed10c9f095c51e4e0a96af5)
(cherry picked from commit 43cf67654ebcfd3f0a8298af7f6cf15cd5f2d981)

s3 swat: Fix possible XSS attack (bug #8289)

Nobuhiro Tsuji of NTT DATA SECURITY CORPORATION reported a possible XSS attack
against SWAT, the Samba Web Administration Tool. The attack uses reflection to
insert arbitrary content into the "change password" page.

This patch fixes the reflection issue by not printing user-specified content on
the website anymore.

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit d88744f460a2a65d4e0cfb6c944f90f09e15d3b4)

release-scripts/create-tarball: always create a tag in form of samba-${version}

metze
(cherry picked from commit 84d9cdb5112e55ae8a1e525ca2b8cef2ae606f22)
(cherry picked from commit d7242cb7fcfca687a4b9c20c4084c74b12fc5aad)

Second part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems.

Re-add:
    smb_ucs2_t toupper_w(smb_ucs2_t v);
    bool isupper_w(smb_ucs2_t v);
    smb_ucs2_t tolower_w(smb_ucs2_t v);
    bool islower_w(smb_ucs2_t v);

and ensure they are called whenever we are operating on smb_ucs2_t
variables. I'd like to make the definition of smb_ucs2_t incompatible
with int and codepoint_t so they can't be mixed, but that's a patch
for another time.
(cherry picked from commit bdc078a81e49bce3b51560a75984e0306c387573)

First part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems

Remove
int toupper_ascii(int c);
int tolower_ascii(int c);
int isupper_ascii(int c);
int islower_ascii(int c);

and replace with their _m equivalents, as they are identical.
(cherry picked from commit 5b6a34128a0e0bc33c255dc53c9fb9fd8e6d34d8)

Fix bug #8307 - brl_close_fnum does not call SMB_VFS_BRL_UNLOCK_WINDOWS on all locks

Reported by herb@samba.org. Remove the (premature) optimization
on file close.
(cherry picked from commit c5b272a05c4bd9d7f70c14fe307b8da46b9e607e)

WHATSNEW: Update changes since rc2.

Karolin
(cherry picked from commit 8585ac3635e9ae284a5b35dba2412d996a73f7ad)

s3:smb2_create: use smbd_calculate_access_mask() instead of smbd_check_open_rights()

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Jul 11 22:45:01 CEST 2011 on sn-devel-104
(cherry picked from commit f5d320ac0fb74d4ad95a03969366096e9b074379)

The last 10 patches address bug #8102 (domuser can change ACL from his files
over the network).
(cherry picked from commit d43d147c9d69dd23296677f9ae998c9362771682)

s3:smb2_tcon: return the correct maximal_access on the share

metze
(cherry picked from commit a1046389ffcc476456ac76cb701a4325d1c42ef9)
(cherry picked from commit 89a05c3a54239d384317f9881430fac264138f3f)

s3:smbd: return the real share access mask in the SMBtconX response

metze
(cherry picked from commit 58eed1b295afeff6acfb8c1f10b0bb02280fd491)
(cherry picked from commit c384bf75284fa7280b9279d305c5404f9f1066df)

s3:smbd: use smbd_calculate_access_mask() also for fake_files

metze
(cherry picked from commit 581d8fa36b73abab030168dc35fb631ccd42a388)
(cherry picked from commit 3e8770619c53c956f623ae852f97e6226513898d)

s3:smbd: check the share level access mask in smbd_calculate_access_mask()

I think we should reject invalid access early,
before we might create new files.

Also smbd_check_open_rights() is only called if the file existed.

metze
(cherry picked from commit 896f105ed40dc04f83bcbfac367b309c8d957f86)
(cherry picked from commit d43f7ffb9fa8449a954d2e9fc9012a00289b41e2)

s3:smbd: make smbd_calculate_access_mask() non-static

metze
(cherry picked from commit ce66d4e4a885add09edfa8e6d5eab0f3b5d63081)
(cherry picked from commit 5a1c2b4774c914a45bf2da7e666f6acf7f6927c6)

s3:smbd/msdfs: let create_conn_struct() check the share security descriptor

metze
(cherry picked from commit 18f967a24881aa899b39f7676fc70a7f7aaca07b)
(cherry picked from commit bd91cb862c4ceb3955c742d1c516e51733a19e6e)

s3: Fix bug 8102

We can't allow open with access that has been denied via the share
security descriptor

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Jul  5 16:21:54 CEST 2011 on sn-devel-104
(cherry picked from commit 4deca5d72804a40e68158a1183f5633dabf24761)
(cherry picked from commit b3a035005ef98bcb31bade50a9e3ddf088302779)

s3: Calculate&store the maximum share access mask

Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 720fa46f9443ccbe471b265f1c2b9cb9782a3c26)
(cherry picked from commit 83c6e9d3ad76e8009778e5ba0bf22e256d06ad48)

s3: Return "granted" from share_access_check

Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 1c022d2e414607633323e65abbc63bb3aeaaa6a4)
(cherry picked from commit 283f76c06308eaeaf9d134e0bfb45188ee684fb3)

s3:smb2_server: add some comments about change_to_user() and change_to_root_user()

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Jul  8 13:45:46 CEST 2011 on sn-devel-104
(cherry picked from commit dbfb88aef30a755c29015bff4699eb17925a4988)

The last 3 patches address bug #8292 (Disable SMB2 for 3.6).
(cherry picked from commit 7b28ae90603ff152e31b2113109bdaebc540810f)

s3:smb2_server: call change_to_root_user() or smbd_smb2_request_check_tcon()

For all requests which don't operate on a tcon, we should call
change_to_root_user(), to match the SMB1 behavior.

For SMB1 we do the following operations without AS_USER:

/* 0x70 */ { "SMBtcon",reply_tcon,0},
/* 0x71 */ { "SMBtdis",reply_tdis,DO_CHDIR},
/* 0x72 */ { "SMBnegprot",reply_negprot,0},
/* 0x73 */ { "SMBsesssetupX",reply_sesssetup_and_X,0},
/* 0x74 */ { "SMBulogoffX",reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */
/* 0x75 */ { "SMBtconX",reply_tcon_and_X,0},
...
/* 0x2b */ { "SMBecho",reply_echo,0},
...
/* 0xa4 */ { "SMBntcancel",reply_ntcancel, 0 },

For SMB2tdis we still call smbd_smb2_request_check_tcon()
as close_cnum() calls change_to_root_user() when needed.

metze

Signed-off-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit eea210eba7c20e6d04b13cf8ccd3011ee7c99157)
(cherry picked from commit 3de9d2204e1f14c8a1d9642f3dc1e1e7e1013210)

s3:smb2_server: there's no reason to check the session id twice on a smb2_tcon request

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Jul  4 17:34:13 CEST 2011 on sn-devel-104
(cherry picked from commit 7c96e96e9881ec1ad7b41f0ab241a5b0ac17b93f)
(cherry picked from commit fe6a325226a5fb17e5ccf62c5d0882d97baa35b7)

WHATSNEW: Update changes since rc2.

Karolin
(cherry picked from commit ae414153864100daa616b169b1b55e2d903b590c)

VERSION: Set version to 3.6.0rc3.

Karolin
(cherry picked from commit 7bbf4bc9870c5a9b02a40d321b2efdb86b0440d2)

Fix bug #Bug 8304 - Uninitialized variable referenced in error path.

princ must not be used uninitialized. auth_data is not used at all.
(cherry picked from commit ba6f88a6720358bea75b162f193182b724b9411c)

Fix bug 8305 - nmbd segfaults - when using "smbtree ..." (cherry picked from commit 102a931c8081559423fb25b3a4d445b6f2e790ac)
(cherry picked from commit e5f4b6e7aa1d102db023a491991684118875ee38)

s3-docs: Remove manpages for ldb tools.

Fix bug #8297 (ldb tools man pages should be removed from the release tar
ball).

Thanks to Björn for reporting!

Karolin
(cherry picked from commit 73e6673078ef8477107cf94a9d53f3d2b42cb6d7)

Fix bug #8293 - SMB2 doesn't rotate the log files often enough.

Move the num_requests field out of the smb1 struct into the generic
struct smbd_server_connection struct. Use it to count SMB2 requests
as well as SMB1 and ensure that check_log_size() is called every 50
SMB2 requests.
(cherry picked from commit b7dbbe1005627932ab959144002f9d41adb04328)

s3-waf: split out LIBCLI_WINREG_INTERNAL as LIBCLI_WINREG was pulling in rpc server code in undesired places.

Andreas, please check.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jul  8 18:34:44 CEST 2011 on sn-devel-104
(cherry picked from commit f4add4fbf545313f5d24e0d9e5c9eb0f8fac630a)

Conflicts:

source3/rpc_server/wscript_build
source3/wscript_build

The last 21 patches address bug #8214 (printer driver upgrade fails, causing
smbd to exit on startup).
(cherry picked from commit 9a555e0271c333d1e33a9f2df435166aa8c6dfde)

s3-printing: remove tdb migration invalid printer name checks

WERR_INVALID_PRINTER_NAME only needed to be handled when printing tdb
migration used spoolss, with winreg such errors are no longer possible.

Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Jul  7 19:15:34 CEST 2011 on sn-devel-104
(cherry picked from commit e5955903fdc5ed6f8660b72db0716d4da25c711c)
(cherry picked from commit 1822df19e764bce37a4b2c7e212a2bb0c61d1d13)

s3-printing: fill info2_mask in printer migration

Also fix possibly uninitialised status return from
printing_tdb_migrate_printer().
(cherry picked from commit 5dd8185d852afc3843253c9471326677f8816a77)
(cherry picked from commit ec0c13d05962e0e3d92dee811667e2dc6bfa67fc)

s3-printing: make sure to first migrate the printers then the security descriptor.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit cfc3b6e5f79f253e83dfbd13d47b671deb5801b3)
(cherry picked from commit d967d1b9ac902cd750cc9c43ecce9481c444504b)

s3-printing: remove spoolss pipe from migration library, only using winreg finally.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 57bbb32c64db1027e2b9ae1aef7f5f3b33ae3882)
(cherry picked from commit 4fc35a5cc9db162a6df7b09e70686caaaa6c352c)

s3-printing: use winreg interface for migration, instead of spoolss.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 8f3d5f5333a61922c4ea7ff1e1d244978958e857)

Conflicts:

source3/printing/nt_printing_migrate.c
(cherry picked from commit 8ca35cd86041d197f3bf377cc0afabe5e2cd4ceb)

s3-printing: safe a ton of roundtrips by reusing existing winreg binding_handles.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 72b1f8be5619ed778c4aa0b967f6a4f34d7e9de8)

Conflicts:

source3/rpc_server/spoolss/srv_spoolss_nt.c
(cherry picked from commit 5bab2244e5893ae6f470299b4efcabd54dc23fcc)

s3-printing: use winreg_internal functions.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 0a1ec73b965f66977a90fb7febb3b56b52ebab20)

Conflicts:

source3/rpc_server/spoolss/srv_spoolss_nt.c
(cherry picked from commit 7c0ab14cc21c47193e7198a01e5ae16052c8d0f9)

s3-printing: add winreg_internal functions.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit ada5380d2090179fc57eee66e2b46788f4944db0)

Conflicts:

source3/rpc_server/spoolss/srv_spoolss_nt.c
source3/rpc_server/spoolss/srv_spoolss_util.c
(cherry picked from commit 77ccfc6f41ca615911d49039046502fcf8e23cee)

s3-printing: add winreg_printer_binding_handle and remove most of srv_spoolss_util.c.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit a762eda519c995214c041170e2615c5c51b2a2b1)

Conflicts:

source3/rpc_server/spoolss/srv_spoolss_util.c
(cherry picked from commit 6bc840366b9c421f742467ef337c8703a8d365ea)

s3-printing: add rpc_client/cli_winreg_spoolss.c

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit f2be8378b92669092f8444df038f769fc9312ff4)
(cherry picked from commit 3c29f9b015809840aaf4de75186536f6f5e91bd9)

s3-waf: make LIBCLI_SPOOLSS a shared library

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit a0fc64a88ee6f1f45d4c2b95d6773eccab50ebb4)
(cherry picked from commit d53dbd8e66b45195c4879a4bb1b9a659b4bf4f99)

s3-printing: move spoolss_create_default_devmode/secdesc to init_spoolss.h

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 43cf3a28dc539351da8a316e0e52a8292ec40cc7)
(cherry picked from commit dd21eaa11c919935f959941aefbba454a272119b)

s3-printing: move driver_info_ctr_to_info8 to init_spoolss.h

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 74e416031b2fc5d9c6af30f692d5b73cb1942cf4)
(cherry picked from commit 2e86c3ffac47bdb43ddc0012d96bd4d489658774)

s3-printing: move os2 related functions to printing/nt_printing_os2.c.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
(cherry picked from commit dd5375b4a1798c856fa9c104baa36c137d664b9d)

Conflicts:

source3/rpc_server/spoolss/srv_spoolss_util.c
(cherry picked from commit b039a965488aba0e8d31abe0a389e6ddef99d8b9)

s3-printing: open up a winreg pipe handle for the migration code.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Jul  4 15:06:41 CEST 2011 on sn-devel-104
(cherry picked from commit ff94539f276bdef73bd12c67bff1f34e697ccbfc)
(cherry picked from commit b1aca06b1823601a5942ead53ed66ca95bd3b8c4)

s3-net: use printing_migrate library, and eliminate duplicate code.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jul  1 17:57:09 CEST 2011 on sn-devel-104
(cherry picked from commit bafd7212eb4c82e86874b2f80ddf5c04b2d180b9)

Conflicts:

source3/utils/net_printing.c
(cherry picked from commit 35de817734fec9dcb0197c20b9c308df2ac7dccc)

s3-printing: split out printing migration code into a smaller library.

Guenther
(cherry picked from commit e02abd6c83708f297b1985bb1bdc7d5dfbc924b2)

Conflicts:

source3/printing/nt_printing_migrate.c
source3/wscript_build
(cherry picked from commit cb1368f19148b30c515f0632fdeb32ef127fa0c7)

s3-printing: skip migration of non-existent printers

Skip tdb migration of printer and security descriptor entries which
refer to non-existent printers.

Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Jun 30 10:54:23 CEST 2011 on sn-devel-104
(cherry picked from commit c9e3f6ab02bdc354a9b656f62744ee66fe9e9e67)
(cherry picked from commit d24c4ef87ff02975cdb024e01b067107c60050cc)

s3-printing: fill devicemode size in migrate_printer()

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

s3-waf: stop building smbtortre4.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu May 12 15:35:02 CEST 2011 on sn-devel-104
(cherry picked from commit c1ac023b588e1ca676cbbf542ca6f93aa199ad32)
(cherry picked from commit f1196b1edc30549d36cc1d8a66541d79a65f31ce)

WHATSNEW: Add changes since rc2.

Karolin
(cherry picked from commit 75785ccbf6d7f633837ae65b2deac0c9bf8cd858)

s3:smb2 fix smbd crash on premature end of smb2 conn (Bug 8286)

when smbd tries to clean up locks after a premature end of a smb2
connection, lock_db has already been freed and so it crashes

this patch changes the order in which items are freed so that
lock_db is still around when it is needed
(cherry picked from commit 2c94ff10332f4be909a158329c41e2f5db035949)

s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)

metze
(cherry picked from commit 75e9f2110876137a57632d223248ac51dbfc4569)
(cherry picked from commit 1c8690c82905ff55ed9eafd02df295edf79e7943)

s3:smbldap: make smbldap_connect_system self contained

The last patches address bug #8253 (winbindd panics if verify_idpool() fails).
(cherry picked from commit c6d5c7cc830d59e7b6f0fa5a38eae27b0f1aa4bb)

s3:smbldap: add a destructor to smbldap_state, just in case
(cherry picked from commit 56bc5c73eaa7509d4e58ed010c834304b238c72c)