sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00
Code
98,363 Commits 60 Branches 1,145 Tags
Commit Graph

98363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Disseldorp
d1e664f154 s4/ntvfs: support FS_SECTOR_SIZE_INFORMATION query-info 
Return the same values as used by s3fs.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2015-03-18 18:57:21 +01:00
David Disseldorp
664dca2b44 s4/client: add FS_SECTOR_SIZE_INFORMATION query support 
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2015-03-18 18:57:20 +01:00
David Disseldorp
ba9fd54bdf s3/smbd: support FS_SECTOR_SIZE_INFORMATION query-info 
The FS_SECTOR_SIZE_INFORMATION query-info level reports sector alignment
information for an underlying share volume, as well as NO_SEEK_PENALTY
and TRIM_ENABLED flags useful for SSD / thin-provisioned storage
detection.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2015-03-18 18:57:20 +01:00
David Disseldorp
8fb488cbcd smbd/trans2: function scope qfsinfo bytes_per_sector 
It's needed for multiple info levels.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2015-03-18 18:57:20 +01:00
Stefan Metzmacher
8421c403e2 s4:kdc: fix realm for outgoing trusts in samba_kdc_trust_message2entry() 
This is a regression introduced in commit
8dd37327b02eaea33915a9cd206667981b8df872.

Now we change 'realm' before calling
ret = krb5_principal_set_realm(context, entry_ex->entry.principal, realm);
as before commit 8dd37327b02eaea33915a9cd206667981b8df872.

Without this we'd set entry_ex->entry.principal to
krbtgt/DOMA.EXAMPLE.COM@DOMA.EXAMPLE.COM instead
of krbtgt/DOMA.EXAMPLE.COM@DOMB.EXAMPLE.COM,
while we use krbtgt/DOMA.EXAMPLE.COM@DOMB.EXAMPLE.COM as
salt for the keys.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Mar 18 18:56:51 CET 2015 on sn-devel-104
 2015-03-18 18:56:51 +01:00
Michael Adam
9d0f7e1766 selftest: the drs.delete_object is currently flakey. 
See
https://git.samba.org/autobuild.flakey/2015-03-18-0813/samba.stdout

[1692(11281)/1735 at 1h54m29s] samba4.drs.delete_object.python(promoted_dc)(promoted_dc)
Testing for DrsDelObjUser_1426658948 with GUID 80f07b62-7edd-4175-8e5c-f44b6081f39c
UNEXPECTED(failure): samba4.drs.delete_object.python(promoted_dc).delete_object.DrsDeleteObjectTestCase.test_ReplicateDeletedObject1(promoted_dc)
REASON: Exception: Exception: Traceback (most recent call last):
  File "bin/python/samba/tests/__init__.py", line 113, in run
    testMethod()
  File "/memdisk/autobuild/fl/b21901/samba/source4/torture/drs/python/delete_object.py", line 214, in test_ReplicateDeletedObject1
    self._check_obj(sam_ldb=self.ldb_dc2, obj_orig=user_orig, is_deleted=True)
  File "/memdisk/autobuild/fl/b21901/samba/source4/torture/drs/python/delete_object.py", line 82, in _check_obj
    self.assertEquals(name_cur, name_orig + "\nDEL:" + guid_str)
AssertionError: 'DrsDelObjUser_1426658948' != 'DrsDelObjUser_1426658948\nDEL:80f07b62-7edd-4175-8e5c-f44b6081f39c'

FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites)

There are many more occurrences:

https://git.samba.org/autobuild.flakey/2013-08-02-1537/samba.stdout
https://git.samba.org/autobuild.flakey/2013-08-04-1536/samba.stdout
https://git.samba.org/autobuild.flakey/2013-08-05-0336/samba.stdout
https://git.samba.org/autobuild.flakey/2013-08-09-1141/samba.stdout
https://git.samba.org/autobuild.flakey/2013-08-13-1537/samba.stdout
https://git.samba.org/autobuild.flakey/2013-08-14-0936/samba.stdout
https://git.samba.org/autobuild.flakey/2013-08-14-1736/samba.stdout
https://git.samba.org/autobuild.flakey/2013-08-15-1936/samba.stdout
...
https://git.samba.org/autobuild.flakey/2014-05-01-1707/samba.stdout
https://git.samba.org/autobuild.flakey/2014-05-03-1411/samba.stdout
https://git.samba.org/autobuild.flakey/2014-05-03-1710/samba.stdout
https://git.samba.org/autobuild.flakey/2014-05-04-1710/samba.stdout
https://git.samba.org/autobuild.flakey/2014-05-13-0507/samba.stdout
https://git.samba.org/autobuild.flakey/2014-05-23-1113/samba.stdout
https://git.samba.org/autobuild.flakey/2014-05-29-0213/samba.stdout
https://git.samba.org/autobuild.flakey/2014-06-02-0513/samba.stdout
https://git.samba.org/autobuild.flakey/2014-06-08-1713/samba.stdout
https://git.samba.org/autobuild.flakey/2014-06-09-0512/samba.stdout
https://git.samba.org/autobuild.flakey/2014-06-14-0214/samba.stdout
...
https://git.samba.org/autobuild.flakey/2015-03-02-0213/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-02-0813/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-03-0513/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-04-0811/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-07-1113/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-07-1713/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-08-2013/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-09-0813/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-09-2008/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-12-0807/samba.stdout

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): Wed Mar 18 15:20:57 CET 2015 on sn-devel-104
 2015-03-18 15:20:57 +01:00
Michael Adam
506ec1667e selftest: the tombstone_reanimation test is currently flakey. 
See
https://git.samba.org/autobuild.flakey/2015-03-18-0456/samba.stdout

[1657(10627)/1735 at 1h37m36s] samba4.tombstone_reanimation.python(fl2003dc)
Test Container reanimation
UNEXPECTED(failure): samba4.tombstone_reanimation.python.tombstone_reanimation.RestoreContainerObjectTestCase.test_container(fl2003dc)
REASON: Exception: Exception: Traceback (most recent call last):
  File "bin/python/samba/tests/__init__.py", line 113, in run
    testMethod()
  File "/memdisk/autobuild/fl/b2199/samba/source4/dsdb/tests/python/tombstone_reanimation.py", line 541, in test_container
    self.assertAttributesEqual(obj, attr_orig, obj_restore, attr_rest)
  File "/memdisk/autobuild/fl/b2199/samba/source4/dsdb/tests/python/tombstone_reanimation.py", line 86, in assertAttributesEqual
    self.assertEqual(attrs_orig, attrs_rest, "Actual object does not have expected attributes")
AssertionError: Actual object does not have expected attributes

FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites)

There are more occurrences:

https://git.samba.org/autobuild.flakey/2015-03-17-1952/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-17-1350/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-16-0452/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-16-0156/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-15-1654/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-14-2253/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-14-1400/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-14-0153/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-13-2251/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-13-1059/samba.stdout
https://git.samba.org/autobuild.flakey/2015-03-13-0759/samba.stdout

Note that this fails in all environments it is configured to run in.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
 2015-03-18 12:43:26 +01:00
Matthew Newton
eb0d6b9999 Ensure we always initialise the winbind context 
Stops segfault when a context is passed. Internal Samba code will
currently always call this with NULL so won't trigger the bug.

Signed-off-by: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Mar 18 01:41:32 CET 2015 on sn-devel-104
 2015-03-18 01:41:32 +01:00
Jeremy Allison
fdb16dd247 lib: talloc: tests - add test_pthread_talloc_passing() testing talloc in a pthread environment. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo <simo@samba.org>
Reviewed-by: "Stefan (metze) Metzmacher" <metze@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Mar 17 19:23:29 CET 2015 on sn-devel-104
 2015-03-17 19:23:29 +01:00
Jeremy Allison
61e0a67c55 lib: docs: talloc: Add a threads tutorial and samples showing how to use talloc with threads. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo <simo@samba.org>
 2015-03-17 16:48:07 +01:00
Michael Adam
9139caa57a dsdb: fix error message in tombstone_reanimation test. 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2015-03-17 16:48:07 +01:00
Michael Adam
06a410dfb1 dsdb: fix error message in sam test 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2015-03-17 16:48:07 +01:00
Volker Lendecke
74e52a42a7 lib: Remove ccan 
The only component, that really used more than tiny bits of ccan was ntdb. Now
that ntdb is gone, ccan is not required anymore either.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue Mar 17 14:06:15 CET 2015 on sn-devel-104
 2015-03-17 14:06:15 +01:00
Volker Lendecke
867f0a80a8 texpect: Do not depend on ccan 
texpect is the only remaining user of ccan code. Copy in the two routines

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:52 +01:00
Volker Lendecke
0c47bdf295 source3: Remove ccan-hash dependency 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:52 +01:00
Volker Lendecke
f686db87a4 source3: Replace ccan hash calls with tdb_jenkins_hash 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:52 +01:00
Volker Lendecke
1016439153 smbd: Remove an unused #include 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:52 +01:00
Volker Lendecke
de811f14af lib: Remove tdb_compat 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:52 +01:00
Volker Lendecke
cf368cbdc5 lib: Remove tdb_fetch_compat 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:52 +01:00
Volker Lendecke
f199e0ebfc lib: Remove tdb_errorstr_compat 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:52 +01:00
Volker Lendecke
98a4037df4 Remove tdb_[first|next]key_compat 
This is essentially a revert of 3a8faefd.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
47795aef9d lib: Remove tdb_open_compat 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
e3e0af14e1 lib: Remove ntdb 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
9dfc521642 waf: Do not recurse into ntdb 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
31c3806a1c dbwrap: Remove a ntdb reference 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
fe81b50d65 Remove ntdb protection from db_open_tdb 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
d08426a158 Remove ntdb protection from tdb_wrap 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
23390f1fee Docs: Remove some ntdb references 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
9fbc2e5018 python: Remove ntdb references 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
334015ebca autobuild: Remove ntdb target 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
89052936ae Remove ntdb from scripts 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
e3d2e6a288 param: Remove "use ntdb" reference 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
959f81ad1b Revert "Samba3-HOWTO: mention NTDB." 
This reverts commit c5bd2ae338c0b67304ee253e3b5139b50cc1d0e5.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
de2c8dd755 param: Remove "use ntdb" 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
6c1d39c328 lib: Remove unused util_ntdb.[ch] 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
8ba7bee613 dbwrap: Remove dbwrap_ntdb 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
460a6e11d9 dbwrap: Remove ntdb logic from dbwrap_local_open 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
d699e1db80 lib: Remove "use_ntdb" param from secrets_init_path 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
b08117976d Remove callers of lp_use_ntdb 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
9943691093 samdb: Ignore ntdb in secrets_tdb_sync 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
 2015-03-17 11:30:51 +01:00
Volker Lendecke
908b1f9634 passdb: Fix the O3 developer build 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Mar 17 11:29:38 CET 2015 on sn-devel-104
 2015-03-17 11:29:38 +01:00
Andrew Bartlett
143e7d3627 lib/util: Make ECHILD in samba_runcmd_io_handler an error 
We now print out a nasty message and set and error if we get ECHILD,
as we no longer set SIGIGN on SIGCHLD in the standard process model.

This was why samba_kcc was able to fail totally without us noticing.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Mar 17 07:05:43 CET 2015 on sn-devel-104
 2015-03-17 07:05:43 +01:00
Andrew Bartlett
30e0238646 s4-process_standard: Remove signal(SIGCHLD, SIG_IGN) 
We replace this with a pipe between parent and child, and then watch
for a read event in the parent to indicate that the child has gone away.

The removal of signal(SIGCHLD, SIG_IGN) requires us to then call
waitpid().  We can't do that in a main loop as we want to get the exit
status to the legitimate waitpid calls in routines like
samba_runcmd_*().

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
 2015-03-17 04:29:06 +01:00
Michael Adam
f212143abc selftest: rename env member to nt4_member 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Mar 17 01:46:18 CET 2015 on sn-devel-104
 2015-03-17 01:46:18 +01:00
Michael Adam
0607148154 selftest: rename env s3dc_schannel to nt4_dc_schannel 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2015-03-16 23:04:47 +01:00
Michael Adam
c157baa4b9 selftest: rename env s3dc to nt4_dc 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2015-03-16 23:04:47 +01:00
Michael Adam
10afe88e44 selftest: rename env s3member_rfc2307 to ad_member_rfc2307 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2015-03-16 23:04:46 +01:00
Michael Adam
25f9ebf270 selftest: rename env s3member to ad_member. 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2015-03-16 23:04:46 +01:00
Michael Adam
3de5abb954 selftest: rename env dc to ad_dc_ntvfs 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2015-03-16 23:04:46 +01:00
Michael Adam
902aa3c710 selftest: rename env plugin_s4_dc to ad_dc 
This is the environment that represents our supported production
setup of an active directory domain controller.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
 2015-03-16 23:04:46 +01:00