[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 517ec63004f vfs_fileid: add "fsname_norootdir_ext" option
via 929555b7c8e vfs_fileid: add extid mapping hooks
from 0ee085b5948 selftest/Samba3.pm: use "winbind use krb5 enterprise
principals = yes" for ad_member
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 517ec63004f6708c9e6b29cb33bd789b1936997b
Author: Ralph Boehme
Date: Tue Sep 3 15:33:42 2019 +0200
vfs_fileid: add "fsname_norootdir_ext" option
This can be used to deliberately break lock coherency between all smbd
processes
in the whole cluster for the root directory of a share.
Signed-off-by: Ralph Boehme
Reviewed-by: Volker Lendecke
Autobuild-User(master): Ralph Böhme
Autobuild-Date(master): Wed Sep 25 00:48:45 UTC 2019 on sn-devel-184
commit 929555b7c8e987a98b704c102323546a2034bea7
Author: Ralph Boehme
Date: Thu Sep 12 14:36:17 2019 +0200
vfs_fileid: add extid mapping hooks
For this always ends up calling fileid_extid_mapping_zero(), so no change in
behaviour. This will change in a subsequent commit.
Signed-off-by: Ralph Boehme
Reviewed-by: Volker Lendecke
---
Summary of changes:
docs-xml/manpages/vfs_fileid.8.xml | 8
source3/modules/vfs_fileid.c | 35 +--
2 files changed, 41 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_fileid.8.xml
b/docs-xml/manpages/vfs_fileid.8.xml
index 8ab1e30c490..defb71229e9 100644
--- a/docs-xml/manpages/vfs_fileid.8.xml
+++ b/docs-xml/manpages/vfs_fileid.8.xml
@@ -87,6 +87,14 @@
algorithm. This can be used to deliberately break lock coherency
in a cluster for the root directory of a share.
+ The fsname_norootdir_ext algorithm
+ generates device ids by hashing the kernel device name, except
+ for the root directory of shares where it will use the hostname
+ algorithm. Additionally it generates an extid based on the
+ process pid. This can be used to deliberately break lock
+ coherency between all smbd processes in the whole cluster for
+ the root directory of a share.
+
diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index cd6f9c30cf3..d7e9090bc18 100644
--- a/source3/modules/vfs_fileid.c
+++ b/source3/modules/vfs_fileid.c
@@ -38,6 +38,8 @@ struct fileid_mount_entry {
struct fileid_handle_data {
uint64_t (*device_mapping_fn)(struct fileid_handle_data *data,
const SMB_STRUCT_STAT *sbuf);
+ uint64_t (*extid_mapping_fn)(struct fileid_handle_data *data,
+ const SMB_STRUCT_STAT *sbuf);
char **fstype_deny_list;
char **fstype_allow_list;
char **mntdir_deny_list;
@@ -280,6 +282,18 @@ static uint64_t fileid_device_mapping_fsid(struct
fileid_handle_data *data,
return m->devid;
}
+static uint64_t fileid_extid_mapping_zero(struct fileid_handle_data *data,
+ const SMB_STRUCT_STAT *sbuf)
+{
+ return 0;
+}
+
+static uint64_t fileid_extid_mapping_pid(struct fileid_handle_data *data,
+const SMB_STRUCT_STAT *sbuf)
+{
+ return getpid();
+}
+
static int get_connectpath_ino(struct vfs_handle_struct *handle,
ino_t *ino)
{
@@ -348,14 +362,30 @@ static int fileid_connect(struct vfs_handle_struct
*handle,
algorithm);
if (strcmp("fsname", algorithm) == 0) {
data->device_mapping_fn = fileid_device_mapping_fsname;
+ data->extid_mapping_fn = fileid_extid_mapping_zero;
} else if (strcmp("fsname_nodirs", algorithm) == 0) {
data->device_mapping_fn = fileid_device_mapping_fsname_nodirs;
+ data->extid_mapping_fn = fileid_extid_mapping_zero;
} else if (strcmp("fsid", algorithm) == 0) {
data->device_mapping_fn = fileid_device_mapping_fsid;
+ data->extid_mapping_fn = fileid_extid_mapping_zero;
} else if (strcmp("hostname", algorithm) == 0) {
data->device_mapping_fn = fileid_device_mapping_hostname;
+ data->extid_mapping_fn = fileid_extid_mapping_zero;
} else if (strcmp("fsname_norootdir", algorithm) == 0) {
data->device_mapping_fn = fileid_device_mapping_fsname;
+ data->extid_mapping_fn = fileid_extid_mapping_zero;
+
+ ret = get_connectpath_ino(handle, >nolockinode);
+ if (ret != 0) {
+ saved_errno =
[SCM] Samba Shared Repository - branch v4-10-test updated
The branch, v4-10-test has been updated
via eaecffd63db classicupgrade: fix a a bytes-like object is required,
not 'str' error
from 1b4ccd961f1 ctdb-tools: Stop deleted nodes from influencing ctdb
nodestatus exit code
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-10-test
- Log -
commit eaecffd63db8b5f0d8072d645862b518f658074b
Author: Björn Jacke
Date: Sat Sep 21 13:24:59 2019 +0200
classicupgrade: fix a a bytes-like object is required, not 'str' error
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14136
Signed-off-by: Bjoern Jacke
Reviewed-by: Björn Baumbach
Autobuild-User(master): Björn Jacke
Autobuild-Date(master): Mon Sep 23 12:58:20 UTC 2019 on sn-devel-184
(cherry picked from commit 465e518d6cc200eefa38643e720ce64e53abac2e)
Autobuild-User(v4-10-test): Karolin Seeger
Autobuild-Date(v4-10-test): Tue Sep 24 20:46:20 UTC 2019 on sn-devel-144
---
Summary of changes:
python/samba/upgrade.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index 12555b7994e..8511bed2868 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -474,7 +474,7 @@ def upgrade_from_samba3(samba3, logger, targetdir,
session_info=None,
ldappass = secrets_db.get_ldap_bind_pw(ldapuser)
if ldappass is None:
raise ProvisioningError("ldapsam passdb backend detected but no
LDAP Bind PW found in secrets.tdb for user %s. Please point this tool at the
secrets.tdb that was used by the previous installation.")
-ldappass = ldappass.strip('\x00')
+ldappass = ldappass.decode('utf-8').strip('\x00')
ldap = True
else:
ldapuser = None
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0ee085b5948 selftest/Samba3.pm: use "winbind use krb5 enterprise principals = yes" for ad_member via e2737a74d44 selftest/Samba3.pm: use "winbind scan trusted domains = no" for ad_member via ad6f0e056ac selftest/tests.py: test pam_winbind for trusts domains via 13e3811c951 selftest: Export TRUST information in the ad_member target environment via f07b542c61f selftest/tests.py: test pam_winbind with a lot of username variations via 36e95e42ea8 selftest/tests.py: test pam_winbind with krb5_auth via 72daf99fd1f selftest/tests.py: prepare looping over pam_winbindd tests via 3d38a8e9135 test_pam_winbind.sh: allow different pam_winbindd config options to be specified via 653e9048585 tests/pam_winbind.py: allow upn names to be used in USERNAME with an empty DOMAIN value via cd3ffaabb56 tests/pam_winbind.py: turn pypamtest.PamTestError into a failure via a77be15d283 s3:winbindd: implement the "winbind use krb5 enterprise principals" logic via 95206523996 docs-xml: add "winbind use krb5 enterprise principals" option via 3bdf023956e krb5_wrap: let smb_krb5_parse_name() accept enterprise principals via 303b7e59a28 s3:libads: ads_krb5_chg_password() should always use the canonicalized principal via 162b4199493 s4:auth: kinit_to_ccache() should always use the canonicalized principal via 5d0bf32ec0a krb5_wrap: smb_krb5_kinit_password_ccache() should always use the canonicalized principal via 0bced73bed4 s3:libads/kerberos: always use the canonicalized principal after kinit via 6ed18c12c57 s3:libsmb: let cli_session_creds_prepare_krb5() update the canonicalized principal to cli_credentials via 361fb0efabf s3:libsmb: avoid wrong debug message in cli_session_creds_prepare_krb5() via bc473e5cf08 s3:libads: let kerberos_kinit_password_ext() return the canonicalized principal/realm via db8fd3d6a31 s4:auth: use the correct client realm in gensec_gssapi_update_internal() via acbf922fc29 nsswitch: add logging to wbc_auth_error_to_pam_error() for non auth errors from 4f5c4df316d wscript_build: string concatenation efficiency cleanup https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0ee085b594878f5e0e83839f465303754f015459 Author: Stefan Metzmacher Date: Wed Sep 18 08:10:26 2019 +0200 selftest/Samba3.pm: use "winbind use krb5 enterprise principals = yes" for ad_member This demonstrates that can do krb5_auth in winbindd without knowning about trusted domains. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14124 Signed-off-by: Stefan Metzmacher Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Tue Sep 24 19:51:29 UTC 2019 on sn-devel-184 commit e2737a74d4453a3d65e5466ddc4405d68444df27 Author: Stefan Metzmacher Date: Wed Sep 18 08:02:38 2019 +0200 selftest/Samba3.pm: use "winbind scan trusted domains = no" for ad_member This demonstrates that we rely on knowning about trusted domains before we can do krb5_auth in winbindd. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14124 Signed-off-by: Stefan Metzmacher Reviewed-by: Guenther Deschner commit ad6f0e056ac27ab5c078dbdbff44372da05caab2 Author: Stefan Metzmacher Date: Sat Jun 10 14:38:40 2017 +0200 selftest/tests.py: test pam_winbind for trusts domains BUG: https://bugzilla.samba.org/show_bug.cgi?id=14124 Signed-off-by: Stefan Metzmacher Reviewed-by: Guenther Deschner commit 13e3811c9510cf213881527877bed40092e0b33c Author: Andreas Schneider Date: Mon Mar 20 11:39:41 2017 +0100 selftest: Export TRUST information in the ad_member target environment BUG: https://bugzilla.samba.org/show_bug.cgi?id=14124 Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Andreas Schneider Signed-off-by: Stefan Metzmacher Reviewed-by: Guenther Deschner commit f07b542c61f84a97c097208e10bf9375ddfa9a15 Author: Stefan Metzmacher Date: Wed Sep 18 14:03:34 2019 +0200 selftest/tests.py: test pam_winbind with a lot of username variations BUG: https://bugzilla.samba.org/show_bug.cgi?id=14124 Signed-off-by: Stefan Metzmacher Reviewed-by: Guenther Deschner commit 36e95e42ea8a7e5a4091a647215d06d2ab47fab6 Author: Stefan Metzmacher Date: Wed Sep 18 08:08:57 2019 +0200 selftest/tests.py: test pam_winbind with krb5_auth BUG: https://bugzilla.samba.org/show_bug.cgi?id=14124 Signed-off-by: Stefan Metzmacher Reviewed-by: Guenther Deschner commit 72daf99fd1ffd8269fce25d69458de35e2ae32cc Author: Stefan Metzmacher Date: Wed Sep 18 01:25:23 2019 +0200 selftest/tests.py: prepare looping over
[SCM] Samba Shared Repository - branch v4-11-test updated
The branch, v4-11-test has been updated
via 18963e909d7 classicupgrade: fix a a bytes-like object is required,
not 'str' error
from d42c7ffa6cb pod2man is no longer needed
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-11-test
- Log -
commit 18963e909d75785b27ea2fd0323fa8514b3e3198
Author: Björn Jacke
Date: Sat Sep 21 13:24:59 2019 +0200
classicupgrade: fix a a bytes-like object is required, not 'str' error
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14136
Signed-off-by: Bjoern Jacke
Reviewed-by: Björn Baumbach
Autobuild-User(master): Björn Jacke
Autobuild-Date(master): Mon Sep 23 12:58:20 UTC 2019 on sn-devel-184
(cherry picked from commit 465e518d6cc200eefa38643e720ce64e53abac2e)
Autobuild-User(v4-11-test): Karolin Seeger
Autobuild-Date(v4-11-test): Tue Sep 24 18:30:08 UTC 2019 on sn-devel-184
---
Summary of changes:
python/samba/upgrade.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index 12555b7994e..8511bed2868 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -474,7 +474,7 @@ def upgrade_from_samba3(samba3, logger, targetdir,
session_info=None,
ldappass = secrets_db.get_ldap_bind_pw(ldapuser)
if ldappass is None:
raise ProvisioningError("ldapsam passdb backend detected but no
LDAP Bind PW found in secrets.tdb for user %s. Please point this tool at the
secrets.tdb that was used by the previous installation.")
-ldappass = ldappass.strip('\x00')
+ldappass = ldappass.decode('utf-8').strip('\x00')
ldap = True
else:
ldapuser = None
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4f5c4df316d wscript_build: string concatenation efficiency cleanup via c9088c6aa84 pfm_verif: string concatenation efficiency cleanup via c7fa030aecd scripting: avoid inefficient string redefinition via 5ad629dcb95 wscript: avoid inefficient string concatenations via b3b6b700c47 s3/wscript: avoid inefficient string concatenations via 32d1c3f873f posixacl.py: avoid inefficient string concatenations via dd9e0f0ae1c auth_log_winbind.py: avoid inefficient string concatenations via cf51f73e02c schema.py: avoid inefficient string concatenations via d2d8ebcca1c user.py: avoid inefficient string concatenations via ce56d336f23 gpo.py: avoid inefficient string concatenations via 1825a7f4e2a kcc_utils.py: avoid inefficient string concatenations via 4c34a2d7256 traffic.py: avoid inefficient string concatenations from b8f4f141a2d ctdb-tests: Switch TEST_VAR_DIR to a local script variable https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4f5c4df316dc029f7b5ed6e8e48636dc61ecfe22 Author: Björn Jacke Date: Fri Aug 23 02:19:20 2019 +0200 wscript_build: string concatenation efficiency cleanup Signed-off-by: Bjoern Jacke Reviewed-by: Matthias Dieter Wallnöfer Autobuild-User(master): Björn Jacke Autobuild-Date(master): Tue Sep 24 13:40:21 UTC 2019 on sn-devel-184 commit c9088c6aa847685613ec34d61b61e31fe0395035 Author: Björn Jacke Date: Fri Aug 23 02:21:17 2019 +0200 pfm_verif: string concatenation efficiency cleanup Signed-off-by: Bjoern Jacke Reviewed-by: Matthias Dieter Wallnöfer commit c7fa030aecd1de5ed32e2509ecd83828aa42c1a3 Author: Björn Jacke Date: Sun Aug 25 23:10:19 2019 +0200 scripting: avoid inefficient string redefinition Signed-off-by: Bjoern Jacke Reviewed-by: Matthias Dieter Wallnöfer commit 5ad629dcb957e45637f3a71309fa51abd87b267d Author: Björn Jacke Date: Sun Aug 25 23:09:19 2019 +0200 wscript: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Matthias Dieter Wallnöfer commit b3b6b700c47ba771baf632b3a165106c21c9ae04 Author: Björn Jacke Date: Sun Aug 25 23:08:18 2019 +0200 s3/wscript: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Matthias Dieter Wallnöfer commit 32d1c3f873fc8bd89a7dc985cb8258e990dc12cd Author: Björn Jacke Date: Sun Aug 25 23:07:48 2019 +0200 posixacl.py: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Matthias Dieter Wallnöfer commit dd9e0f0ae1cca23920883a0e04fe5862663e400e Author: Björn Jacke Date: Sun Aug 25 23:07:13 2019 +0200 auth_log_winbind.py: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Andrew Bartlett commit cf51f73e02cab85f508bcbef362ff75a7ae18d7f Author: Björn Jacke Date: Sun Aug 25 23:06:19 2019 +0200 schema.py: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Andrew Bartlett commit d2d8ebcca1cc4539a7a6b48fa364e03adda1db6c Author: Björn Jacke Date: Sun Aug 25 23:06:00 2019 +0200 user.py: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Andrew Bartlett commit ce56d336f234febfd4cb3da11dd584842c24ce1d Author: Björn Jacke Date: Sun Aug 25 23:05:31 2019 +0200 gpo.py: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Andrew Bartlett commit 1825a7f4e2a39d03f01da37b68ba4f65dbafd04a Author: Björn Jacke Date: Sun Aug 25 23:05:10 2019 +0200 kcc_utils.py: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Andrew Bartlett commit 4c34a2d72569f31d59b904c3ca1c140f6084b3dd Author: Björn Jacke Date: Sun Aug 25 23:04:25 2019 +0200 traffic.py: avoid inefficient string concatenations Signed-off-by: Bjoern Jacke Reviewed-by: Andrew Bartlett --- Summary of changes: docs-xml/wscript_build | 20 ++- python/samba/emulate/traffic.py | 4 +- python/samba/kcc/kcc_utils.py| 195 +-- python/samba/netcmd/gpo.py | 9 +- python/samba/netcmd/user.py | 58 python/samba/schema.py | 7 +- python/samba/tests/auth_log_winbind.py | 3 +- python/samba/tests/posixacl.py | 4 +- source3/wscript | 4 +- source4/scripting/bin/samba_upgradeprovision | 8 +- source4/scripting/devel/config_base | 9 +- source4/scripting/devel/pfm_verify.py| 4 +- wscript
