sfrench/samba-autobuild/.git
8 years agoVERSION: Set version to 4.4.0... samba-4.4.0
Karolin Seeger [Mon, 21 Mar 2016 16:03:17 +0000 (17:03 +0100)]
VERSION: Set version to 4.4.0...

and disable git snapshots.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
8 years agoWHATSNEW: Add release notes for Samba 4.4.0.
Karolin Seeger [Mon, 21 Mar 2016 16:01:32 +0000 (17:01 +0100)]
WHATSNEW: Add release notes for Samba 4.4.0.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
8 years agolib/socket/interfaces: Fix some uninitialied bytes.
Günther Deschner [Wed, 2 Mar 2016 17:32:53 +0000 (18:32 +0100)]
lib/socket/interfaces: Fix some uninitialied bytes.

Valgrind reports the following:

==26599== Syscall param ioctl(SIOCETHTOOL) points to uninitialised byte(s)
==26599==    at 0x7014707: ioctl (in /usr/lib64/libc-2.22.so)
==26599==    by 0x79D1585: query_iface_speed_from_name (interfaces.c:152)
==26599==    by 0x79D1BBA: _get_interfaces (interfaces.c:277)
==26599==    by 0x79D1E80: get_interfaces (interfaces.c:368)
==26599==    by 0x508A7E3: load_interfaces (interface.c:612)
==26599==    by 0x150B30: main (net.c:963)
==26599==  Address 0xffefff0d8 is on thread 1's stack
==26599==  in frame #1, created by query_iface_speed_from_name
(interfaces.c:130)
==26599==
==26599== Syscall param ioctl(SIOCETHTOOL) points to uninitialised byte(s)
==26599==    at 0x7014707: ioctl (in /usr/lib64/libc-2.22.so)
==26599==    by 0x79D15CC: query_iface_speed_from_name (interfaces.c:164)
==26599==    by 0x79D1BBA: _get_interfaces (interfaces.c:277)
==26599==    by 0x79D1E80: get_interfaces (interfaces.c:368)
==26599==    by 0x508A7E3: load_interfaces (interface.c:612)
==26599==    by 0x150B30: main (net.c:963)
==26599==  Address 0xffefff0d8 is on thread 1's stack
==26599==  in frame #1, created by query_iface_speed_from_name
(interfaces.c:130)

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 2e2f81134c86ef3146781d62d9f561f496b74ee2)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11802
lib/socket/interfaces: fix valgrind warning

Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-4-test): Mon Mar 21 20:01:47 CET 2016 on sn-devel-144

8 years agobuild: fix build when --without-quota specified
Uri Simchoni [Wed, 16 Mar 2016 18:20:02 +0000 (20:20 +0200)]
build: fix build when --without-quota specified

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11798

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 228ab3466d0e5af46313de200b5b976d46838378)

8 years agoWHATSNEW: document the experimental smb3-multi-channel feature
Michael Adam [Tue, 15 Mar 2016 20:56:44 +0000 (21:56 +0100)]
WHATSNEW: document the experimental smb3-multi-channel feature

Signed-off-by: Michael Adam <obnox@samba.org>
8 years agoVERSION: Bump version up to 4.4.0rc6...
Karolin Seeger [Tue, 15 Mar 2016 20:09:25 +0000 (21:09 +0100)]
VERSION: Bump version up to 4.4.0rc6...

and re-enable git snapshots.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
8 years agoVERSION: Disable git snapshots for the Samba 4.4.0rc5 release. samba-4.4.0rc5
Karolin Seeger [Tue, 15 Mar 2016 20:08:45 +0000 (21:08 +0100)]
VERSION: Disable git snapshots for the Samba 4.4.0rc5 release.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
8 years agoWHATSNEW: Add release notes for Samba 4.4.0rc5.
Karolin Seeger [Tue, 15 Mar 2016 20:07:44 +0000 (21:07 +0100)]
WHATSNEW: Add release notes for Samba 4.4.0rc5.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
8 years agosmbd: enable multi-channel if 'server multi channel support = yes' in the config
Michael Adam [Tue, 26 Jan 2016 07:16:51 +0000 (08:16 +0100)]
smbd: enable multi-channel if 'server multi channel support = yes' in the config

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue Mar 15 20:58:19 CET 2016 on sn-devel-144

(cherry picked from commit e85e4055b940ea3be4e5beb12a62ad448dbbc73d)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11796

Autobuild-User(v4-4-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-4-test): Wed Mar 16 03:16:40 CET 2016 on sn-devel-144

8 years agoparam: add parameter "server multi channel support", defaults to off.
Günther Deschner [Wed, 20 Jan 2016 16:44:45 +0000 (17:44 +0100)]
param: add parameter "server multi channel support", defaults to off.

Guenther

Pair-Programmed-With: Michael Adam <obnox@samba.org>

Signed-off-by: Guenther Deschner <gd@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 8a71e1a5a803510f60c8610d06e7868739dc31b1)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11796

8 years agoselftest: Avoid sorting issues on Ubuntu 10.04 vs 14.04
Andrew Bartlett [Wed, 9 Mar 2016 01:08:41 +0000 (14:08 +1300)]
selftest: Avoid sorting issues on Ubuntu 10.04 vs 14.04

The unimportant lines starting with # sorted differently between these
two platforms.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit ca9bbc8cc5bdf83de532d7afe094e35cdeee788c)

The last 42 patches address

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11789
Required changes for talloc-2.1.6

Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-4-test): Tue Mar 15 23:46:31 CET 2016 on sn-devel-144

8 years agopytalloc: Correct description of pytalloc_Get{Base,}ObjectType behaviour
Andrew Bartlett [Tue, 8 Mar 2016 00:46:16 +0000 (13:46 +1300)]
pytalloc: Correct description of pytalloc_Get{Base,}ObjectType behaviour

Thanks to Jelmer for spotting the static variable that causes this odd behaviour

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Mar  8 05:14:15 CET 2016 on sn-devel-144

(cherry picked from commit 20417945fed17a8f6ca2b0fc66c20890dc1f48b8)

8 years agodbcheck: Check for and remove duplicate values in attributes
Andrew Bartlett [Tue, 23 Feb 2016 01:57:04 +0000 (14:57 +1300)]
dbcheck: Check for and remove duplicate values in attributes

This can happen with three DCs and custom schema, but we test
it by just forcing the values directly into the backing tdb.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit c79c1e405d52c5dc54b8f03cd891e47f7ea04497)

8 years agoselftest: Allow 4 hours for the test to run (ouch!)
Andrew Bartlett [Tue, 1 Mar 2016 19:54:42 +0000 (08:54 +1300)]
selftest: Allow 4 hours for the test to run (ouch!)

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 13e62b2e350a21beefe871de64900fb78c5385f7)

8 years agopysmb: Use pytalloc_BaseObject_PyType_Ready()
Andrew Bartlett [Tue, 1 Mar 2016 02:17:44 +0000 (15:17 +1300)]
pysmb: Use pytalloc_BaseObject_PyType_Ready()

This changes pysmb to use talloc.BaseObject() just like the PIDL output

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 8440dda3cbc747f18148e52e6875055148438267)

8 years agopysmb: Do not use pytalloc_Object directly
Andrew Bartlett [Tue, 1 Mar 2016 02:08:26 +0000 (15:08 +1300)]
pysmb: Do not use pytalloc_Object directly

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit c763253f05aa07afc84bc27d2d8387f454edbded)

8 years agopysmb: Rework py_smb_new() to use pytalloc_steal()
Andrew Bartlett [Tue, 1 Mar 2016 01:53:00 +0000 (14:53 +1300)]
pysmb: Rework py_smb_new() to use pytalloc_steal()

This avoids casting to pytalloc_Object directly

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 05b99bed8cb4bf98de06fbbe19347efc049245c6)

8 years agopysmb: Use pytalloc_get_mem_ctx()
Andrew Bartlett [Tue, 1 Mar 2016 02:05:28 +0000 (15:05 +1300)]
pysmb: Use pytalloc_get_mem_ctx()

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 9a34a1567bb9b9f4f5dc3f28d05845ed13cf31a9)

8 years agopysmb: Use pytalloc_get_ptr()
Andrew Bartlett [Tue, 1 Mar 2016 01:55:59 +0000 (14:55 +1300)]
pysmb: Use pytalloc_get_ptr()

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit a2013c3a5ab80283a4b95004e4d1606e0003a4a8)

8 years agopyregistry: Use pytalloc_BaseObject_PyType_Ready()
Andrew Bartlett [Mon, 29 Feb 2016 20:33:48 +0000 (09:33 +1300)]
pyregistry: Use pytalloc_BaseObject_PyType_Ready()

This changes pyregistry to use talloc.BaseObject() just like the PIDL output

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 6d348c443a92dfe9bdad73d36c0303a765468870)

8 years agopyauth: Use pytalloc_BaseObject_PyType_Ready()
Andrew Bartlett [Mon, 29 Feb 2016 20:32:56 +0000 (09:32 +1300)]
pyauth: Use pytalloc_BaseObject_PyType_Ready()

This changes pyauth to use talloc.BaseObject() just like the PIDL output

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit ffc75363307a25c27dbdd52eb08bd54964416650)

8 years agopygensec: Use pytalloc_BaseObject_PyType_Ready()
Andrew Bartlett [Mon, 29 Feb 2016 20:32:06 +0000 (09:32 +1300)]
pygensec: Use pytalloc_BaseObject_PyType_Ready()

This changes pygensec to use talloc.BaseObject() just like the PIDL output

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 0f35167d767e4ace2295f3025110470504f160d3)

8 years agopygensec: Use pytalloc_steal() in gensec_start_{client,server}()
Andrew Bartlett [Tue, 1 Mar 2016 01:19:33 +0000 (14:19 +1300)]
pygensec: Use pytalloc_steal() in gensec_start_{client,server}()

This is better than casting to get to the pytalloc_Object structure directly

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit ec5d63f9edcf311b581df4f37a702a54d659d443)

8 years agopyparam: Use pytalloc_BaseObject_PyType_Ready()
Andrew Bartlett [Mon, 29 Feb 2016 20:31:00 +0000 (09:31 +1300)]
pyparam: Use pytalloc_BaseObject_PyType_Ready()

This changes pyparam to use talloc.BaseObject() just like the PIDL output

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 43af1905d578ec6f374f1f67f72c37428ecd361f)

8 years agopy_passdb: Use pytalloc_BaseObject_PyType_Ready()
Andrew Bartlett [Mon, 29 Feb 2016 20:30:03 +0000 (09:30 +1300)]
py_passdb: Use pytalloc_BaseObject_PyType_Ready()

This changes py_passdb to use talloc.BaseObject() just like the PIDL output

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 0705aee099aa4961ad521c55f8c344f4e3a338ee)

8 years agopycredentials: Use pytalloc_BaseObject_PyType_Ready()
Andrew Bartlett [Mon, 29 Feb 2016 20:27:11 +0000 (09:27 +1300)]
pycredentials: Use pytalloc_BaseObject_PyType_Ready()

This changes pycredentials to use talloc.BaseObject() just like the PIDL output

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit fc747539dc1219135face7d6f77c7174a9c978cd)

8 years agopytalloc: Add pytalloc_BaseObject_PyType_Ready() wrapper
Andrew Bartlett [Mon, 29 Feb 2016 20:26:29 +0000 (09:26 +1300)]
pytalloc: Add pytalloc_BaseObject_PyType_Ready() wrapper

This avoids the need for the caller to set tp_base and tp_basicsize and
so removes those as possible errors.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit d850991ee2284050916761ea2f0ccac45df4eb4f)

8 years agopyparam: Do not use pytalloc_Object directly
Andrew Bartlett [Mon, 29 Feb 2016 03:27:31 +0000 (16:27 +1300)]
pyparam: Do not use pytalloc_Object directly

This type should not be used directly, it should have been made private
to pytalloc.  This then allows removal of the (PyCFunction) cast

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit d82b11b21cb3905b112fc49956c98beb1cb79ed9)

8 years agopypassdb: Do not use pytalloc_Object directly
Andrew Bartlett [Mon, 29 Feb 2016 03:27:12 +0000 (16:27 +1300)]
pypassdb: Do not use pytalloc_Object directly

This type should not be used directly, it should have been made private
to pytalloc.  This then allows removal of the (PyCFunction) cast

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit e622411c488772fd20e94d3e13aff2a0db0ecf13)

8 years agopycredentials: Remove PyCredentialCacheContainerObject
Andrew Bartlett [Mon, 29 Feb 2016 03:26:08 +0000 (16:26 +1300)]
pycredentials: Remove PyCredentialCacheContainerObject

We can call pytalloc_reference() and avoid having this in the header file

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 750632199641ff437585bc3a6835e282ce1d5395)

8 years agopycredentials: Do not use pytalloc_Object directly
Andrew Bartlett [Mon, 22 Feb 2016 01:10:23 +0000 (14:10 +1300)]
pycredentials: Do not use pytalloc_Object directly

This type should not be used directly, it should have been made private
to pytalloc

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit fe4b990cbaf4c6b204c2d206f2a04ff5cd273f9f)

8 years agodbcheck: Avoid spurious warnings in dbcheck due to objectclass sorting
Andrew Bartlett [Wed, 23 Dec 2015 20:43:36 +0000 (09:43 +1300)]
dbcheck: Avoid spurious warnings in dbcheck due to objectclass sorting

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11433
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit c36b2d7fb8f10ec229bb8e6be3999ab83a26dc36)

8 years agodbcheck: Fix incorrect/duplicate attrid in replPropertMetaData
Andrew Bartlett [Tue, 22 Dec 2015 06:48:38 +0000 (19:48 +1300)]
dbcheck: Fix incorrect/duplicate attrid in replPropertMetaData

If custom schema is used in a replicated DC environment, these are created as soon as
an attribute is modified on more than one DC.  We have to remove these.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11443
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 5fb98a3534a806331307a425d9469164e27d7ee7)

8 years agoselftest: Update release-4-1-0rc3 with more test records
Andrew Bartlett [Wed, 23 Dec 2015 00:16:57 +0000 (13:16 +1300)]
selftest: Update release-4-1-0rc3 with more test records

CN=ops_run_anything2,OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp

This will be modified during the dbcheck to show that new
versions of Samba will reset the attid correctly

CN=ops_run_anything3,OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp

This will not be modified, and shows how a 4.1 DC without
replication would record custom schema objects.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit ac83f729bc80d02f042a337d9a06dfc4ef0632ac)

8 years agorpc_server/drsuapi: Block replication of incorrect/duplicate attrid in replPropertMet...
Andrew Bartlett [Tue, 22 Dec 2015 06:39:31 +0000 (19:39 +1300)]
rpc_server/drsuapi: Block replication of incorrect/duplicate attrid in replPropertMetaData

If custom schema is used in a replicated DC environment, these are created as soon as
an attribute is modified on more than one DC.  We have to prevent replication
as otherwise we will corrupt the client replica state.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11443
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 7397aa47fddca43b3b4931a961e6d8e742fdf181)

8 years agorepl_meta_data: Correctly use msDS-IntId for custom schema, not the prefixMap value
Andrew Bartlett [Tue, 22 Dec 2015 06:33:39 +0000 (19:33 +1300)]
repl_meta_data: Correctly use msDS-IntId for custom schema, not the prefixMap value

We must, when dealing with custom schema, respect the msDC-IntId value recorded
in the schema.  If we do not, then we will create multiple replPropertyMetaData
records for the one attribute.  This may cause confusion during replication.

This fixes the issue by always calling dsdb_attribute_get_attid() to obtain
the correct local (32 bit integer) attribute ID

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11443
(cherry picked from commit ecf0dd49e07e2c7fad5adf0a82abbc3e301a4e5a)

8 years agopidl: Use a tmp_ctx helper variable
Andrew Bartlett [Thu, 25 Feb 2016 00:57:37 +0000 (13:57 +1300)]
pidl: Use a tmp_ctx helper variable

This is so we free the ndr_push_struct_blob() return value after
we make it into a string

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 90bf114f6370ee837d97e36eb25f38f8234dcd39)

8 years agopidl: Use the $mem_ctx helper variable
Andrew Bartlett [Thu, 25 Feb 2016 00:57:00 +0000 (13:57 +1300)]
pidl: Use the $mem_ctx helper variable

This is already set to pytalloc_get_mem_ctx(py_obj)

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit dffa2dbfabca14f07af12663fc93c8dc3bc837cf)

8 years agopidl: Fix our python reference handling
Andrew Bartlett [Tue, 16 Feb 2016 01:06:28 +0000 (14:06 +1300)]
pidl: Fix our python reference handling

The new talloc.BaseObject allow us to hold a talloc context per
python object (there may be many referring to the same C object)
and the talloc context that the actual object pointer is under.

Another advantage is that talloc.BaseObject(), has less of
an ABI surface.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 9e07f3a13b41be1f019887581b2a2bd049039a3d)

8 years agopyrpc: Clarify failure mode after pytalloc_reference_ex() improvements
Andrew Bartlett [Mon, 7 Mar 2016 22:18:56 +0000 (11:18 +1300)]
pyrpc: Clarify failure mode after pytalloc_reference_ex() improvements

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 627fdf0468e9f575ea1a5de1fd57a87a239a4b96)

8 years agotalloc: Bump version number
Andrew Bartlett [Tue, 16 Feb 2016 03:15:53 +0000 (16:15 +1300)]
talloc: Bump version number

The removal of the macros and replacement with proper functions
is a API, but not ABI break.  Only code that incorrectly
used the structure either in function signatures or
to access the members directly will need to be modified
before being built against this version of talloc.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit d7bbcbc510c6ecfcd9db47c15203bbdd13d1c06e)

8 years agopytalloc: Add new BaseObject
Andrew Bartlett [Mon, 22 Feb 2016 01:02:28 +0000 (14:02 +1300)]
pytalloc: Add new BaseObject

This new object not only avoids the ABI issues of talloc.Object
it stores one more pointer, being the start of the array, and
so can be used to fix the PIDL bindings/talloc refcount issue.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 80f2b36efb6380defb646f7612f23c431acf8e1a)

8 years agopytalloc: add a _pytalloc_get_type() helper function and generate PyExc_TypeError...
Stefan Metzmacher [Mon, 22 Feb 2016 07:47:07 +0000 (08:47 +0100)]
pytalloc: add a _pytalloc_get_type() helper function and generate PyExc_TypeError on mismatch

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 528dce1b5326e00446f5fe233b8af52bcb1990a9)

8 years agotalloc: add _pytalloc_get_ptr/_pytalloc_get_mem_ctx helper functions
Andrew Bartlett [Mon, 22 Feb 2016 01:29:15 +0000 (14:29 +1300)]
talloc: add _pytalloc_get_ptr/_pytalloc_get_mem_ctx helper functions

This allows us to check which type is involved, and dereference
that type correctly

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 42eae4dec6209aa5cae0d48f17f33c1ab67b6f03)

8 years agotalloc: Improve testsuite by avoiding path issues
Andrew Bartlett [Mon, 22 Feb 2016 22:04:51 +0000 (11:04 +1300)]
talloc: Improve testsuite by avoiding path issues

We now rely on waf to tell us where the helper binary is.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit cd8d9300213dcdeb5bdfbbb7a71ae4b82e042470)

8 years agopyrpc: Add warning about abuse of py_return_ndr_struct()
Andrew Bartlett [Mon, 7 Mar 2016 22:16:27 +0000 (11:16 +1300)]
pyrpc: Add warning about abuse of py_return_ndr_struct()

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 623bf4230c3458a266de7759d0ead07d986d6951)

8 years agopydsdb: Fix returning of ldb.MessageElement.
Andrew Bartlett [Tue, 16 Feb 2016 02:15:44 +0000 (15:15 +1300)]
pydsdb: Fix returning of ldb.MessageElement.

This object is not based on pytalloc_Object and so this causes
a segfault (later a failure) when the struct definitions diverge.
We must also not reuse the incoming ldb_message_element as a talloc
context and overwrite the values, instead we should create a new
object and return that.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit b96b1e88f760c92c7d9bb7e732f72d7e73a68907)

8 years agopyldb: Add warning about pyldb_MessageElement_AsMessageElement()
Andrew Bartlett [Mon, 7 Mar 2016 21:39:24 +0000 (10:39 +1300)]
pyldb: Add warning about pyldb_MessageElement_AsMessageElement()

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 02de793e013c1905cccc0c760bb64f45d37e3051)

8 years agoselftest: specify a maximum runtime for 'make testenv' of 1 year
Stefan Metzmacher [Fri, 22 Jan 2016 15:57:15 +0000 (16:57 +0100)]
selftest: specify a maximum runtime for 'make testenv' of 1 year

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit 90cb84c9052bbe7c23fa6e58a3041f0c05249821)

8 years agos3/passdb/py_passdb.c: free frame before returning
Aurelien Aptel [Mon, 29 Feb 2016 17:23:39 +0000 (18:23 +0100)]
s3/passdb/py_passdb.c: free frame before returning

these talloc frames are freed *after* the return instruction and are
never executed. this fixes potential memory leaks.

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Tue Mar  1 12:08:40 CET 2016 on sn-devel-144

(cherry picked from commit f2675909d34b1847a889e65023b9f0ed36e6bd52)

8 years agobuild: mark explicit dependencies on pytalloc-util
Garming Sam [Tue, 15 Mar 2016 00:29:54 +0000 (13:29 +1300)]
build: mark explicit dependencies on pytalloc-util

All subsystems that include pytalloc.h need to link against
pytalloc-util.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11789

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
8 years agolibsmb/pysmb: add pytalloc-util dependency to fix the build.
Günther Deschner [Mon, 1 Feb 2016 22:11:13 +0000 (23:11 +0100)]
libsmb/pysmb: add pytalloc-util dependency to fix the build.

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Tue Feb  2 15:49:14 CET 2016 on sn-devel-144

(cherry picked from commit 943e69ca8fd4491004eafbf29ed2ca748b0b7480)

8 years agoselftest: mark samba4.winbind.struct.domain_info.ad_member as flapping
Stefan Metzmacher [Fri, 11 Mar 2016 09:49:21 +0000 (10:49 +0100)]
selftest: mark samba4.winbind.struct.domain_info.ad_member as flapping

See https://lists.samba.org/archive/samba-technical/2016-March/112861.html

  found 517 lines matching '^UNEXPECTED' in 641 files matching 'samba.stdout$'
   175 UNEXPECTED(failure): samba4.winbind.struct.domain_info(ad_member:local)
    19 UNEXPECTED(failure): samba4.winbind.struct.domain_info(s3member:local)
    12 UNEXPECTED(failure): samba4.rpc.backupkey with seal.backupkey.server_wrap_encrypt_decrypt_wrong_key(ad_dc_ntvfs)
    12 UNEXPECTED(failure): samba4.drs.delete_object.python(promoted_dc).delete_object.DrsDeleteObjectTestCase.test_ReplicateDeletedObject1(promoted_dc)
    12 UNEXPECTED(failure): samba4.rpc.backupkey with seal.backupkey.server_wrap_decrypt_wrong_r2(ad_dc_ntvfs)
    11 UNEXPECTED(failure): samba4.ldap.notification.python(ad_dc_ntvfs).__main__.LDAPNotificationTest.test_max_search(ad_dc_ntvfs)

We'll see if we also need to add
samba4.winbind.struct.domain_info.s3member
before we're able to identify and fix the problem.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sat Mar 12 02:14:39 CET 2016 on sn-devel-144

(cherry picked from commit 2ef0eed07e494546ba6720a17f00b40d9bafa8ef)

8 years agobuild: fix disk-free quota support on Solaris 10
Uri Simchoni [Wed, 3 Feb 2016 04:41:42 +0000 (06:41 +0200)]
build: fix disk-free quota support on Solaris 10

Samba has no code to support quota on Solaris 10 (and possibly other
os's such as AIX) using the new quota interface. The new interface
serves both disk size/free space reporting (clamping the underlying
file system numbers with quota), and direct manipulation of the user's
quota.

However, there's legacy code that supports only disk size/free space on
Solaris 10. In the waf build, this code is not compiled because there is
no test for it.

This patch adds a test to see whether the legacy code can be used.

Issue reported and fix tested by Andrew Morgan <morgan@orst.edu>.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11788

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sun Mar 13 01:37:58 CET 2016 on sn-devel-144

(cherry picked from commit 0a9acd445d246c7758e994b0c69cc90bdbbef2fe)

8 years agosmbd: Only check dev/inode in open_directory, not the full stat()
Andrew Bartlett [Fri, 11 Mar 2016 01:27:53 +0000 (14:27 +1300)]
smbd: Only check dev/inode in open_directory, not the full stat()

This is needed because the smb2.create.mkdir-dup test creates a race,
and against an AD DC this can cause a flapping test if the lstat() and
stat() calls are made either side of the chown() due to creation of a
file by administrator.

Fix based on original patches by myself, by Douglas Bagnall
<douglas.bagnall@catalyst.net.nz>.  and Jeremy Allison <jra@samba.org>

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11780

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Mar 12 09:43:21 CET 2016 on sn-devel-144

(cherry picked from commit 5fc6d2dabdf2aeef74fdefaa67eae0348bbf7a44)

8 years agos3:winbindd: don't unclude two '\0' at the end of the domain list
Stefan Metzmacher [Thu, 10 Mar 2016 11:17:43 +0000 (12:17 +0100)]
s3:winbindd: don't unclude two '\0' at the end of the domain list

This avoids a scary "trustdom_list_done: Got invalid trustdom response" message.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
(cherry picked from commit bb387c5b90e19b5a2f7d65fb8db816e9da51d090)

8 years agos3:libnet:libnet_join: update msDS-SupportedEncryptionTypes (if required) with machin...
Günther Deschner [Fri, 11 Mar 2016 22:15:06 +0000 (23:15 +0100)]
s3:libnet:libnet_join: update msDS-SupportedEncryptionTypes (if required) with machine creds.

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Guenther Deschner <gd@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Mar 14 19:38:48 CET 2016 on sn-devel-144

(cherry picked from commit 06aefe4b956ae8748e20ae4c730aa344e81808b6)

8 years agos3:libnet:libnet_join: fill in output enctypes and only modify when necessary.
Günther Deschner [Fri, 11 Mar 2016 15:05:53 +0000 (16:05 +0100)]
s3:libnet:libnet_join: fill in output enctypes and only modify when necessary.

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 5d498d1b4d9b83f179fb7b2841a19ad984eec5f8)

8 years agos3:libnet:libnet_join: define list of desired encryption types only once.
Günther Deschner [Fri, 11 Mar 2016 15:04:52 +0000 (16:04 +0100)]
s3:libnet:libnet_join: define list of desired encryption types only once.

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit e0da059b39f9dd5ccb74f32f965e1ced384c77eb)

8 years agos3:librpc:idl:libnet_join: add encryption types to libnet_JoinCtx.
Günther Deschner [Fri, 11 Mar 2016 15:02:27 +0000 (16:02 +0100)]
s3:librpc:idl:libnet_join: add encryption types to libnet_JoinCtx.

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 4a49f6fac9d6c77d1eedf914308e67eb6e2baa8d)

8 years agos3:libnet:libnet_join: always try to create machineaccount via LDAP first.
Günther Deschner [Thu, 10 Mar 2016 17:03:47 +0000 (18:03 +0100)]
s3:libnet:libnet_join: always try to create machineaccount via LDAP first.

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit df8f79cc9d44ad7b2caa6b86b7ebde7bb1fd4c8c)

8 years agos3:libads:ldap: fix ads_check_ou_dn to deal with account_ou not being initialized
Günther Deschner [Fri, 11 Mar 2016 11:15:14 +0000 (12:15 +0100)]
s3:libads:ldap: fix ads_check_ou_dn to deal with account_ou not being initialized

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit c61b111e6fa3e138d4d9cf5038b69644248e834a)

8 years agos3:libads:ndr: add ADS_AUTH_USER_CREDS to ndr_print_ads_auth_flags()
Günther Deschner [Fri, 11 Mar 2016 11:13:24 +0000 (12:13 +0100)]
s3:libads:ndr: add ADS_AUTH_USER_CREDS to ndr_print_ads_auth_flags()

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit e8f6acdeece990dc8953d494113dee856d80da45)

8 years agos3:libads:ldap: print LDAP error message with log level 10.
Günther Deschner [Fri, 4 Mar 2016 16:42:05 +0000 (17:42 +0100)]
s3:libads:ldap: print LDAP error message with log level 10.

Guenther

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 34030b025b9e4cd5e7321d6e242f6c03da2a60c0)

8 years agos3:libnet:libnet_join: prepare to allow connecting with machine creds.
Günther Deschner [Wed, 2 Mar 2016 17:07:53 +0000 (18:07 +0100)]
s3:libnet:libnet_join: prepare to allow connecting with machine creds.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 71d5634ab58f0ca21db633990231bd01a22c956c)

8 years agoPartly revert "s3:libads: setup the msDS-SupportedEncryptionTypes attribute on ldap_add"
Günther Deschner [Fri, 11 Mar 2016 22:14:13 +0000 (23:14 +0100)]
Partly revert "s3:libads: setup the msDS-SupportedEncryptionTypes attribute on ldap_add"

This partly reverts commit 0c74d62524db376b6a3fac00c688be0cdffcaa80.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11755

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 6686f67d2a91146c8bb2fb2a8104fcaa5710b855)

8 years agovfs_glusterfs: Fix use after free in AIO callback.
Ira Cooper [Fri, 4 Mar 2016 13:01:25 +0000 (08:01 -0500)]
vfs_glusterfs: Fix use after free in AIO callback.

The wrapper->state pointer is not getting NULLed during free
allowing us to do a use after free.

Thanks to Red Hat for discovering this issue.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11774

Signed-off-by: Ira Copper <ira@samba.org>
Reviewed-by: Poornima G <pgurusid@redhat.com>
Tested-by: Christopher Blum <cblum@redhat.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-4-test): Mon Mar 14 13:19:27 CET 2016 on sn-devel-144

8 years agos3:smbd: add negprot remote arch detection for OSX
Justin Maggard [Wed, 2 Mar 2016 18:19:56 +0000 (10:19 -0800)]
s3:smbd: add negprot remote arch detection for OSX

Remote arch detection for OSX clients has been broken for some time, since
both Samba and OSX started supporting SMB2.  Fix it by adding modern OSX
client detection support to the negprot remote arch detection routine.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11773

Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <rb@sernet.de>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Mar  3 09:03:53 CET 2016 on sn-devel-144

(cherry picked from commit d7ca174744001fabdc32e1c334dad347bb985756)

8 years agos3:smbd: rework negprot remote arch detection
Justin Maggard [Wed, 2 Mar 2016 18:18:34 +0000 (10:18 -0800)]
s3:smbd: rework negprot remote arch detection

Negprot remote arch detection is very cryptic.  Rework it so it's easier
to understand, and therefore more extensible, following the protocol table
in inline comments.  This also allows us to remove some hacks.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11773

Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
Reviewed-by: Ralph Boehme <rb@sernet.de>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit b69b96fc14128f50a906b4f5b34934efbc94afbc)

8 years agoctdb-common: For AF_PACKET socket types, protocol is in network order
Amitay Isaacs [Thu, 3 Mar 2016 03:17:40 +0000 (14:17 +1100)]
ctdb-common: For AF_PACKET socket types, protocol is in network order

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11770

From man page of packet(7):

                                             protocol is the  IEEE  802.3
   protocol  number  in  network  byte  order.  See the <linux/if_ether.h>
   include file for a list of allowed protocols.  When protocol is set  to
   htons(ETH_P_ALL),  then all protocols are received.

Protocol argument was changed from network order to host order wrongly
in commit 9f8395cb7d49b63a82f75bf504f5f83920102b29.

Specifying "protocol" field to socket(AF_PACKET, ...) call only affects
the packets that are recevied.  So use protocol = 0 when sending raw
packets.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Mar  4 12:58:50 CET 2016 on sn-devel-144

(cherry picked from commit f5b6a5b13406c245ab9cc8c1699483af9eb21f88)

8 years agolibnet: make Kerberos domain join site-aware
Uri Simchoni [Thu, 3 Mar 2016 07:18:58 +0000 (09:18 +0200)]
libnet: make Kerberos domain join site-aware

When joining a domain using Kerberos authentication, create a
configuration file for the Kerberos libs to prefer on-site
domain controllers, without relying on the winbindd Kerberos
locator, which many not be operational at this stage.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11769

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Mar  8 01:30:35 CET 2016 on sn-devel-144

(cherry picked from commit 0dbab0e33e9efc46f72b6a8b0dc894ea251df9aa)

8 years agodsgetdcname: fix flag check
Uri Simchoni [Thu, 3 Mar 2016 07:18:57 +0000 (09:18 +0200)]
dsgetdcname: fix flag check

Fix the check for zero requseted flags.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11769

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 6d717402e42131298ba670ee47686379854ec56d)

8 years agodsgetdcname: return an IP address on rediscovery
Uri Simchoni [Thu, 3 Mar 2016 07:18:44 +0000 (09:18 +0200)]
dsgetdcname: return an IP address on rediscovery

When dsgetdcname return its result based on discovery
process (instead of retrieving cached value), always
return the found server's IP address in dc_address field,
rather than its netbios name.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11769

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit ef84f4c018424b1fcc232a4780dc2c0435701d86)

8 years agodsdb/repl: Ensure we use the LOCAL attid value, not the remote one
Andrew Bartlett [Thu, 10 Mar 2016 00:43:15 +0000 (13:43 +1300)]
dsdb/repl: Ensure we use the LOCAL attid value, not the remote one

The key here is that while this never was an issue for builtin schema,
nor for objects with an msDS-IntID used outside the schema partition,
additional attributes added and used in the schema partition were
incorrectly using the wrong attributeID value in the replPropertyMetaData.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11783

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Sun Mar 13 23:29:14 CET 2016 on sn-devel-144

(cherry picked from commit 6ecfc4cb254f9b2524ec5619ed8cee9db5d959b2)

8 years agosmbd:smb2: move op variable into scope of use in smb2_create_send
Michael Adam [Thu, 3 Mar 2016 08:27:42 +0000 (09:27 +0100)]
smbd:smb2: move op variable into scope of use in smb2_create_send

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit 272d06d40b7338de7db8954192f42c7340753920)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agosmbd:smb2: implement create replay
Michael Adam [Sun, 28 Feb 2016 01:32:36 +0000 (02:32 +0100)]
smbd:smb2: implement create replay

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 2fd54b533292e54de8c289fb093748fb171c15a7)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agosmbXsrv.idl: add create_action to smbXsrv_open
Michael Adam [Mon, 29 Feb 2016 01:11:26 +0000 (02:11 +0100)]
smbXsrv.idl: add create_action to smbXsrv_open

Needed for create replay.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 03a3aa981500c5ba9d82c27f36e107672b071203)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agosmbXsrv:open: add smb2srv_open_lookup_replay_cache()
Michael Adam [Sat, 27 Feb 2016 02:23:27 +0000 (03:23 +0100)]
smbXsrv:open: add smb2srv_open_lookup_replay_cache()

A function to find an open from the replay cache,
based on the create_guid handed in.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 5b90c986eda8201660434a9a1d64e5a0a625379e)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agosmb2:create: create replay cache when request has a create_guid
Michael Adam [Fri, 26 Feb 2016 12:53:25 +0000 (13:53 +0100)]
smb2:create: create replay cache when request has a create_guid

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 08e34830b7f4d631a24e94aad1502949eb2cd675)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agosmbXsrv:open: maintain a replay cache
Michael Adam [Tue, 23 Feb 2016 23:23:15 +0000 (00:23 +0100)]
smbXsrv:open: maintain a replay cache

This caches a map create_guid -> file_id, so that
a replayed create can find the already created
open again.

This is automatically deleted once the first use
of the file handle is happening (triggered by
the lookup for the file-id).

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 4370bda3c0f35c1cc9b45a004bb829b1d69a4e38)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agolibrpc:smbXsrv.idl: add flags to smbXsrv_open
Michael Adam [Fri, 26 Feb 2016 12:44:13 +0000 (13:44 +0100)]
librpc:smbXsrv.idl: add flags to smbXsrv_open

These flags reflect the need for and state of the replay cache.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 1eb5f1e42276999f0f4fc73cac03a188fb6d83e9)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agosmbd:smb2: allow the REPLAY_OPERATION flag for SMB3+ requests
Michael Adam [Wed, 24 Feb 2016 14:53:57 +0000 (15:53 +0100)]
smbd:smb2: allow the REPLAY_OPERATION flag for SMB3+ requests

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 6251d926e0cdd37ed312f7dc78ce2735e979c25f)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: add smb2.replay.replay-dhv2-lease3
Michael Adam [Wed, 2 Mar 2016 19:45:16 +0000 (20:45 +0100)]
torture:smb2: add smb2.replay.replay-dhv2-lease3

create with a lease, and replay with lease
with a different lease key.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 1b804d6f93fec74af45e89465fc7316917a3b64f)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: add smb2.replay.replay-oplock-lease
Michael Adam [Wed, 2 Mar 2016 00:38:24 +0000 (01:38 +0100)]
torture:smb2: add smb2.replay.replay-oplock-lease

create with an oplock, and replay with a lease.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 1c772984c64e79b3da9851be29a26714ed209343)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: add smb2.replay.replay-dhv2-lease-oplock
Michael Adam [Tue, 1 Mar 2016 22:03:50 +0000 (23:03 +0100)]
torture:smb2: add smb2.replay.replay-dhv2-lease-oplock

Open with a lease and replay with an oplock.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 2036e1d27b7dde091531c4a8a516212e4b489df2)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: add smb2.replay.replay-dhv2-lease2
Michael Adam [Mon, 29 Feb 2016 18:04:32 +0000 (19:04 +0100)]
torture:smb2: add smb2.replay.replay-dhv2-lease2

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 6eeabe43a2378a832dc21a1d8acdaf18b0dbc889)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: add smb2.replay.replay-dhv2-lease1
Michael Adam [Mon, 29 Feb 2016 17:23:04 +0000 (18:23 +0100)]
torture:smb2: add smb2.replay.replay-dhv2-lease1

This is a variant of the replay-dhv2-oplock1 test for leases
instead of for oplocks.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit de678ebcdfda49d373d6151d362074ad66bf280e)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2:replay: extend CHECK_CREATE_OUT() to know leases
Michael Adam [Mon, 29 Feb 2016 18:00:42 +0000 (19:00 +0100)]
torture:smb2:replay: extend CHECK_CREATE_OUT() to know leases

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 6eac2ae984c244d9e92876bf29a18a3807352277)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: split rename2 into multiple tests and extend these
Michael Adam [Tue, 1 Mar 2016 00:18:03 +0000 (01:18 +0100)]
torture:smb2: split rename2 into multiple tests and extend these

- replay-regular
- replay-dhv2-oplock1
- replay-dhv2-oplock2
- replay-dhv2-oplock3

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 9ac9d286b4584388b10d2c6247094aed8b0e68a6)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: rename replay1 -> replay-commands
Michael Adam [Tue, 1 Mar 2016 00:14:48 +0000 (01:14 +0100)]
torture:smb2: rename replay1 -> replay-commands

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 9ebf079b00b642c5df47fecffc3ff1fc96525235)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: skip replay4 if server does not support multi-channel
Michael Adam [Tue, 1 Mar 2016 22:07:06 +0000 (23:07 +0100)]
torture:smb2: skip replay4 if server does not support multi-channel

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Wed Mar  2 20:38:49 CET 2016 on sn-devel-144

(cherry picked from commit f24567e9fd6ad5925691df2ebc23cfd8a127c5a8)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agosmbd: fix crash in smbXsrv_client_global_remove()
Michael Adam [Tue, 1 Mar 2016 19:40:47 +0000 (20:40 +0100)]
smbd: fix crash in smbXsrv_client_global_remove()

Probably copy-n-paste error.
Uncovered by the multi-channel-related tests we're
currently writing to exercise this code more.

Pair-Programmed-With: Guenther Deschner <gd@samba.org>

Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 04265199b389a7b38c3047985da68e8442a0b746)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agonetlogon_creds_cli: use dbwrap_purge instead of dbwrap_delete where appropriate
Michael Adam [Thu, 25 Feb 2016 15:15:04 +0000 (16:15 +0100)]
netlogon_creds_cli: use dbwrap_purge instead of dbwrap_delete where appropriate

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit bebd35f439229b9363dfc2f4ae5744103ba80740)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agos3:registry: use dbwrap_purge_bystring instead of dbwrap_delete_bystring
Michael Adam [Wed, 24 Feb 2016 23:58:50 +0000 (00:58 +0100)]
s3:registry: use dbwrap_purge_bystring instead of dbwrap_delete_bystring

where appropriate

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit 8f158bab9f8dbdbdb460258a08a15d0d6c41cbac)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agodbwrap: add dbwrap_purge[_bystring]
Michael Adam [Wed, 24 Feb 2016 23:56:14 +0000 (00:56 +0100)]
dbwrap: add dbwrap_purge[_bystring]

Variants of dbrwap_delete[_bysrting] that treats NOT FOUND
as success.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit 366b51a8ff30132185ff126e2cdd51801b07e6f4)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agodbwrap_util: improve a debug message in dbwrap_delete_action()
Michael Adam [Thu, 25 Feb 2016 15:02:36 +0000 (16:02 +0100)]
dbwrap_util: improve a debug message in dbwrap_delete_action()

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit d4408c495be851c684e7b4b5ff56e5eb82f16c06)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: fix skip message if share is not CA
Michael Adam [Mon, 29 Feb 2016 00:52:42 +0000 (01:52 +0100)]
torture:smb2: fix skip message if share is not CA

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 6d008556722a5bca73e5881345497ec8f97595dd)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: skip replay5 test if server does not support persistent handles
Michael Adam [Mon, 29 Feb 2016 00:52:07 +0000 (01:52 +0100)]
torture:smb2: skip replay5 test if server does not support persistent handles

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit cd3ee2a2aa46cb49e14c451ea8ee64039e5b8fa6)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agotorture:smb2: skip replay3 if server does not support Multi-Channel
Michael Adam [Mon, 29 Feb 2016 00:51:23 +0000 (01:51 +0100)]
torture:smb2: skip replay3 if server does not support Multi-Channel

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 95835b9280f8b191245786305b43ae802886ee01)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779

8 years agosmbd:smb2_creat: remove outdated TODO comments
Michael Adam [Sun, 28 Feb 2016 00:46:47 +0000 (01:46 +0100)]
smbd:smb2_creat: remove outdated TODO comments

Leases have meanwhile been implemented and the
TODO has been taken care of.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allson <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sun Feb 28 08:16:26 CET 2016 on sn-devel-144

(cherry picked from commit abd8b182447fce6dc1436e8ff3907b871705d7e0)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11779