[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3452b0d2cec netcmd: user: readpasswords: move syncpasswords command to readpasswords via 1929cca223d netcmd: user: readpasswords: move getpassword command to readpasswords via 24c567610ab netcmd: user: readpasswords: move common.py to readpasswords via 6319df10b7b netcmd: user: readpasswords: move show command to readpasswords via fab69e47ef8 netcmd: user: readpasswords: turn getpassword.py into readpasswords module via 10aa17a4039 netcmd: user: move user sensitive command via 8c4a6e55495 netcmd: user: move user add_unix_attrs command via 95f6abebeab netcmd: user: move user unlock command via 44a974e1edc netcmd: user: move user rename command via 41492dadcc1 netcmd: user: move user move command via 4a34b6813dc netcmd: user: move user show command via d08f726065f netcmd: user: move user edit command via b51456836d2 netcmd: user: move user getpassword and syncpasswords commands via 65fc1472053 netcmd: user: move user setpassword command via a6e1b5694f1 netcmd: user: move user setprimarygroup command via f20b5f6052f netcmd: user: move user getgroups command via 9b47a424337 netcmd: user: move user password command via 84c13a8696b netcmd: user: move common code used by various password commands via c621183c652 netcmd: user: move user setexpiry command via 69536ff70f2 netcmd: user: move user list command via 0385e4a97e9 netcmd: user: move user disable command via 970c2bcb8e7 netcmd: user: move user enable command via e85070b01d9 netcmd: user: move user delete command via 87aae028900 netcmd: user: move user add command via 5949adab16b netcmd: user: turn user.py into module netcmd.user from 85c8222bdb7 s4:kdc: Fix code spelling https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3452b0d2cec399f7a512877efb02c3e262e2940e Author: Rob van der Linde Date: Tue Aug 1 13:28:33 2023 +1200 netcmd: user: readpasswords: move syncpasswords command to readpasswords Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Aug 4 05:27:53 UTC 2023 on atb-devel-224 commit 1929cca223dc1521458d5c0029de15d5487f2560 Author: Rob van der Linde Date: Tue Aug 1 13:25:54 2023 +1200 netcmd: user: readpasswords: move getpassword command to readpasswords Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 24c567610abdb65cdd645ab82e590142636f9dcf Author: Rob van der Linde Date: Tue Aug 1 13:19:51 2023 +1200 netcmd: user: readpasswords: move common.py to readpasswords it only contains code relating to the getpassword module Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 6319df10b7bcc810d83491ced9a11e0fdbe7db0b Author: Rob van der Linde Date: Tue Aug 1 13:09:06 2023 +1200 netcmd: user: readpasswords: move show command to readpasswords Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit fab69e47ef899a86d5cb65fb4a8578fcc4f63c3e Author: Rob van der Linde Date: Tue Aug 1 13:05:28 2023 +1200 netcmd: user: readpasswords: turn getpassword.py into readpasswords module Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 10aa17a40394cca55941f0eada4967f01bbd7644 Author: Rob van der Linde Date: Thu Jul 27 17:30:14 2023 +1200 netcmd: user: move user sensitive command Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 8c4a6e55495d1647a4d2a1f84a9104679f81f4d1 Author: Rob van der Linde Date: Thu Jul 27 17:28:10 2023 +1200 netcmd: user: move user add_unix_attrs command Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 95f6abebeab06d4490930359997d8f8f04ece05f Author: Rob van der Linde Date: Thu Jul 27 17:26:06 2023 +1200 netcmd: user: move user unlock command Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 44a974e1edc1f02a70d8b4e0cf7854d8dea3e26d Author: Rob van der Linde Date: Thu Jul 27 17:22:55 2023 +1200 netcmd: user: move user rename command Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 41492dadcc1f727f2ab530a86e8312ccfd880111 Author: Rob van der Linde Date: Thu Jul 27 17:19:34 2023 +1200 netcmd: user: move user move command Signed-off-by: Rob van der
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 85c8222bdb7 s4:kdc: Fix code spelling via b29793ffdee s4:dsdb:tests: Fix code spelling via bedc978c81f s4:dsdb:schema: Fix code spelling via 969bcc28627 s4:dsdb:schema: Fix trailing white spaces via f34ef1ef505 s4:dsdb:samdb: Fix code spelling via 3ebe11cd43b s4:dsdb:repl: Fix code spelling via e3319795801 s4:dsdb:kcc: Fix code spelling via 2304ec43970 s4:dsdb:common: Fix code spelling via ed3c1fcb878 s4:dns_server: Fix code spelling via dbb1fbe8668 s4:client: Fix code spelling via 694980224ab s4:cldap_server: Fix code spelling via 795e464cfaf s4:auth: Fix code spelling via 01c31c8f6d0 s3:spoolss: Remove dead code via 0ed62798ddd s3:utils: Fix code spelling via edcebcd48a4 lib:tevent: Fix code spelling via d0b2c27d2f6 lib:fuzzing: Fix code spelling from 06d673a1a0c third_party/heimdal: Import lorikeet-heimdal-202308030152 (commit 2a036a6fd80833799316b8a85623cdea3a1135df) https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 85c8222bdb7ea3524cbbfa2da6bbeb1191a819c2 Author: Andreas Schneider Date: Wed Aug 2 10:47:30 2023 +0200 s4:kdc: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Aug 3 15:25:01 UTC 2023 on atb-devel-224 commit b29793ffdee5d9b9c1c05830622e80f7faec7670 Author: Andreas Schneider Date: Wed Aug 2 10:44:32 2023 +0200 s4:dsdb:tests: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit bedc978c81fd92edeb3eb6d3efb3a55eb1a8bca3 Author: Andreas Schneider Date: Wed Aug 2 10:44:02 2023 +0200 s4:dsdb:schema: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit 969bcc28627ffd22ee9251d4510c5adef263fb49 Author: Andreas Schneider Date: Wed Aug 2 10:44:50 2023 +0200 s4:dsdb:schema: Fix trailing white spaces Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit f34ef1ef5054d453e0923dbcad8fd0ca977cc3e4 Author: Andreas Schneider Date: Wed Aug 2 10:41:31 2023 +0200 s4:dsdb:samdb: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit 3ebe11cd43bedb98214664e7cf99632295b0ca34 Author: Andreas Schneider Date: Wed Aug 2 10:40:56 2023 +0200 s4:dsdb:repl: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit e33197958017d6ab12649319e71ab16969694d94 Author: Andreas Schneider Date: Wed Aug 2 10:40:35 2023 +0200 s4:dsdb:kcc: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit 2304ec43970ab79415ff28f3e2327b157e1b2799 Author: Andreas Schneider Date: Wed Aug 2 10:39:57 2023 +0200 s4:dsdb:common: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit ed3c1fcb878918663588652ecf4d7aa6e41711b5 Author: Andreas Schneider Date: Wed Aug 2 10:37:18 2023 +0200 s4:dns_server: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit dbb1fbe8668175aecf7f9b9a86664c1378499292 Author: Andreas Schneider Date: Thu Jul 20 11:36:01 2023 +0200 s4:client: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit 694980224ab8df02945e24c2065d9af4c6f30611 Author: Andreas Schneider Date: Thu Jul 20 11:35:39 2023 +0200 s4:cldap_server: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit 795e464cfaf806f758ab4c12b815d9eb4aaf3c02 Author: Andreas Schneider Date: Thu Jul 20 11:34:28 2023 +0200 s4:auth: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit 01c31c8f6d02fa99cf843ded1a5c25f4d017ba62 Author: Andreas Schneider Date: Wed Aug 2 10:35:27 2023 +0200 s3:spoolss: Remove dead code Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit 0ed62798ddd98d3faf5a90d9cea5bb5bc10950d8 Author: Andreas Schneider Date: Thu Jul 20 11:33:37 2023 +0200 s3:utils: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit edcebcd48a474190940a53ddb8fac6099a4f0b6d Author: Andreas Schneider Date: Wed Aug 2 10:33:35 2023 +0200 lib:tevent: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton commit d0b2c27d2f6778b928da4b8b76dd5a02b038f69c Author: Andreas Schneider Date: Thu Jul 20 11:31:43 2023 +0200 lib:fuzzing: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton
[SCM] Samba Shared Repository - branch v4-19-test updated
The branch, v4-19-test has been updated
via 1231268c219 s3/modules: Fix DFS links when widelinks = yes
via 368b3e6102b s3/modules: Add flag indicating if connected share is a
dfs share
via ece48278912 sefltest: Add new regression test dfs with widelinks =
yes
via d59392056e7 selftest: Add new dfs share (with widelinks enabled)
from e7f91e1d22b vfs_aio_pthread: fix segfault if samba-tool ntacl get
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-19-test
- Log -
commit 1231268c219a2f00ad62c7d109db96129b0d2388
Author: Noel Power
Date: Thu Jul 27 13:26:21 2023 +0100
s3/modules: Fix DFS links when widelinks = yes
In openat(), even if we fail to open the file,
propagate stat if and only if the object is a link in
a DFS share. This allows calling code to further process
the link.
Also remove knownfail
Pair-Programmed-With: Jeremy Alison
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Sat Jul 29 00:43:52 UTC 2023 on atb-devel-224
(cherry picked from commit 0bf8b25aacdf2f5c746922320b32e3f0886c81f5)
Autobuild-User(v4-19-test): Jule Anger
Autobuild-Date(v4-19-test): Thu Aug 3 14:30:32 UTC 2023 on atb-devel-224
commit 368b3e6102b5a7d9df0f243ced7d75fe8605eb79
Author: Noel Power
Date: Thu Jul 27 17:36:29 2023 +0100
s3/modules: Add flag indicating if connected share is a dfs share
Not used yet, will be used in the next commit to avoid testing
if the connected share is a dfs one.
Pair-Programmed-With: Jeremy Alison
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit 2668dcd0968133cca4f8410bf8c41ed0483f5d87)
commit ece48278912e14432f34f6d0edcd26768e299406
Author: Noel Power
Date: Fri Jul 28 09:41:59 2023 +0100
sefltest: Add new regression test dfs with widelinks = yes
Adds a new test trying to cd into dfs path on share with
widelinks enabled, should generate an error (see BUG:)
Add a knownfail so CI continues
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit 3d2e9db8b95f9f45d486f8272e53584975f177fa)
commit d59392056e796c2c491e5f53dac2f9161b329bf4
Author: Noel Power
Date: Fri Jul 28 09:40:57 2023 +0100
selftest: Add new dfs share (with widelinks enabled)
Adds share (to be used in later test) that has dfs node
but additionally has widelinks set to yes
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit b57cdfd7efb161cf96b3a39dc7a1652db817e602)
---
Summary of changes:
selftest/target/Samba3.pm | 5
source3/modules/vfs_widelinks.c| 30 +++---
source3/script/tests/test_bug15435_widelink_dfs.sh | 28
source3/selftest/tests.py | 10
4 files changed, 70 insertions(+), 3 deletions(-)
create mode 100755 source3/script/tests/test_bug15435_widelink_dfs.sh
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index b4c3c130e9a..39831afc599 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -3034,6 +3034,11 @@ sub provision($$)
msdfs root = yes
msdfs shuffle referrals = yes
guest ok = yes
+[msdfs-share-wl]
+ path = $msdfs_shrdir
+ msdfs root = yes
+ wide links = yes
+ guest ok = yes
[msdfs-share2]
path = $msdfs_shrdir2
msdfs root = yes
diff --git a/source3/modules/vfs_widelinks.c b/source3/modules/vfs_widelinks.c
index 0045242ba81..29f2d4834f6 100644
--- a/source3/modules/vfs_widelinks.c
+++ b/source3/modules/vfs_widelinks.c
@@ -106,6 +106,7 @@
struct widelinks_config {
bool active;
+ bool is_dfs_share;
char *cwd;
};
@@ -134,7 +135,8 @@ static int widelinks_connect(struct vfs_handle_struct
*handle,
DBG_ERR("vfs_widelinks module loaded with "
"widelinks = no\n");
}
-
+ config->is_dfs_share =
+ (lp_host_msdfs() && lp_msdfs_root(SNUM(handle->conn)));
SMB_VFS_HANDLE_SET_DATA(handle,
config,
NULL, /* free_fn */
@@ -346,7 +348,7 @@ static int widelinks_openat(vfs_handle_struct *handle,
{
struct vfs_open_how how = *_how;
struct widelinks_config *config = NULL;
-
+ int ret;
[SCM] Samba Shared Repository - branch v4-17-test updated
The branch, v4-17-test has been updated
via 10f3fafc6f4 s3/modules: Fix DFS links when widelinks = yes
via b63c917cf74 s3/modules: Add flag indicating if connected share is a
dfs share
via 98a53e95a0f sefltest: Add new regression test dfs with widelinks =
yes
via 9ace53099ed selftest: Add new dfs share (with widelinks enabled)
from d94cbb10b88 s3/utils: avoid erronous NO MEMORY detection
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-test
- Log -
commit 10f3fafc6f4fedbc182894c3d03fd2939cfcee18
Author: Noel Power
Date: Thu Jul 27 13:26:21 2023 +0100
s3/modules: Fix DFS links when widelinks = yes
In openat(), even if we fail to open the file,
propagate stat if and only if the object is a link in
a DFS share. This allows calling code to further process
the link.
Also remove knownfail
Pair-Programmed-With: Jeremy Alison
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Sat Jul 29 00:43:52 UTC 2023 on atb-devel-224
(cherry picked from commit 0bf8b25aacdf2f5c746922320b32e3f0886c81f5)
Autobuild-User(v4-17-test): Jule Anger
Autobuild-Date(v4-17-test): Thu Aug 3 12:46:29 UTC 2023 on sn-devel-184
commit b63c917cf742682f909597349d2f1f513c422ec7
Author: Noel Power
Date: Thu Jul 27 17:36:29 2023 +0100
s3/modules: Add flag indicating if connected share is a dfs share
Not used yet, will be used in the next commit to avoid testing
if the connected share is a dfs one.
Pair-Programmed-With: Jeremy Alison
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit 2668dcd0968133cca4f8410bf8c41ed0483f5d87)
commit 98a53e95a0f36e60355e3e2d2719018cd485f436
Author: Noel Power
Date: Fri Jul 28 09:41:59 2023 +0100
sefltest: Add new regression test dfs with widelinks = yes
Adds a new test trying to cd into dfs path on share with
widelinks enabled, should generate an error (see BUG:)
Add a knownfail so CI continues
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit 3d2e9db8b95f9f45d486f8272e53584975f177fa)
commit 9ace53099ed5cc9cb3cabe2f104882b0f260ea43
Author: Noel Power
Date: Fri Jul 28 09:40:57 2023 +0100
selftest: Add new dfs share (with widelinks enabled)
Adds share (to be used in later test) that has dfs node
but additionally has widelinks set to yes
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit b57cdfd7efb161cf96b3a39dc7a1652db817e602)
---
Summary of changes:
selftest/target/Samba3.pm | 5
source3/modules/vfs_widelinks.c| 30 +++---
source3/script/tests/test_bug15435_widelink_dfs.sh | 28
source3/selftest/tests.py | 10
4 files changed, 70 insertions(+), 3 deletions(-)
create mode 100755 source3/script/tests/test_bug15435_widelink_dfs.sh
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3336c5b8e97..8f680b73d87 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -3023,6 +3023,11 @@ sub provision($$)
msdfs root = yes
msdfs shuffle referrals = yes
guest ok = yes
+[msdfs-share-wl]
+ path = $msdfs_shrdir
+ msdfs root = yes
+ wide links = yes
+ guest ok = yes
[msdfs-share2]
path = $msdfs_shrdir2
msdfs root = yes
diff --git a/source3/modules/vfs_widelinks.c b/source3/modules/vfs_widelinks.c
index 2a35ea5eb68..c68468a950b 100644
--- a/source3/modules/vfs_widelinks.c
+++ b/source3/modules/vfs_widelinks.c
@@ -106,6 +106,7 @@
struct widelinks_config {
bool active;
+ bool is_dfs_share;
char *cwd;
};
@@ -134,7 +135,8 @@ static int widelinks_connect(struct vfs_handle_struct
*handle,
DBG_ERR("vfs_widelinks module loaded with "
"widelinks = no\n");
}
-
+ config->is_dfs_share =
+ (lp_host_msdfs() && lp_msdfs_root(SNUM(handle->conn)));
SMB_VFS_HANDLE_SET_DATA(handle,
config,
NULL, /* free_fn */
@@ -346,7 +348,7 @@ static int widelinks_openat(vfs_handle_struct *handle,
{
struct vfs_open_how how = *_how;
struct widelinks_config *config = NULL;
-
+ int ret;
[SCM] Samba Shared Repository - branch v4-19-test updated
The branch, v4-19-test has been updated
via e7f91e1d22b vfs_aio_pthread: fix segfault if samba-tool ntacl get
from 68db9b7390b dsdb: Use samdb_system_container_dn() in
pdb_samba_dsdb_*()
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-19-test
- Log -
commit e7f91e1d22b60069af9081dedd1b244273322ea3
Author: Jones Syue
Date: Wed Aug 2 09:48:40 2023 +0800
vfs_aio_pthread: fix segfault if samba-tool ntacl get
If configured as AD DC and aio_pthread appended into 'vfs objects'[1],
run these commands would get segfault:
1. sudo samba-tool ntacl get .
2. sudo net vfs getntacl sysvol .
gdb said it goes through aio_pthread_openat_fn() @ vfs_aio_pthread.c[2],
and the fsp->conn->sconn->client is null (0x0).
'sconn->client' memory is allocated when a new connection is accpeted:
smbd_accept_connection > smbd_process > smbXsrv_client_create
While running local commands looks like it would not go through
smbXsrv_client_create so the 'client' is null, segfault might happen.
We should not dereference 'client->server_multi_channel_enabled',
if 'client' is null.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15441
[1] smb.conf example, samba-4.18.5, ubuntu 22.04.2
[global]
dns forwarder = 127.0.0.53
netbios name = U22-JONES-88X1
realm = U22-JONES-88X1.X88X1.JONES
server role = active directory domain controller
workgroup = X88X1
idmap_ldb:use rfc2307 = yes
vfs objects = dfs_samba4 acl_xattr aio_pthread
[sysvol]
path = /var/lib/samba/sysvol
read only = No
[netlogon]
path = /var/lib/samba/sysvol/u22-jones-88x1.x88x1.jones/scripts
read only = No
[2] gdb
(gdb) run /usr/local/samba/bin/samba-tool ntacl get .
Starting program: /usr/local/Python3/bin/python3
/usr/local/samba/bin/samba-tool ntacl get .
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/libthread_db.so.1".
Program received signal SIGSEGV, Segmentation fault.
0x7fffd0eb809e in aio_pthread_openat_fn (handle=0x8d5cc0,
dirfsp=0x8c3070, smb_fname=0x18ab4f0, fsp=0x1af3550, flags=196608, mode=0)
at ../../source3/modules/vfs_aio_pthread.c:467
warning: Source file is more recent than executable.
467 if (fsp->conn->sconn->client->server_multi_channel_enabled)
{
(gdb) bt
at ../../source3/modules/vfs_aio_pthread.c:467
at ../../source3/smbd/pysmbd.c:320
---Type to continue, or q to quit---
(gdb) f
at ../../source3/modules/vfs_aio_pthread.c:467
467 if (fsp->conn->sconn->client->server_multi_channel_enabled)
{
(gdb) p fsp->conn->sconn->client
$1 = (struct smbXsrv_client *) 0x0
(gdb)
Signed-off-by: Jones Syue
Reviewed-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
(cherry picked from commit 8f4c1c67b4f118a9a47b09ac7908cd3d969b19c2)
Autobuild-User(v4-19-test): Jule Anger
Autobuild-Date(v4-19-test): Thu Aug 3 09:45:34 UTC 2023 on atb-devel-224
---
Summary of changes:
source3/modules/vfs_aio_pthread.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_aio_pthread.c
b/source3/modules/vfs_aio_pthread.c
index 428ae5f2a4c..0303ff04bc9 100644
--- a/source3/modules/vfs_aio_pthread.c
+++ b/source3/modules/vfs_aio_pthread.c
@@ -475,7 +475,8 @@ static int aio_pthread_openat_fn(vfs_handle_struct *handle,
aio_allow_open = false;
}
- if (fsp->conn->sconn->client->server_multi_channel_enabled) {
+ if (fsp->conn->sconn->client != NULL &&
+ fsp->conn->sconn->client->server_multi_channel_enabled) {
/*
* This module is not compatible with multi channel yet.
*/
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-18-test updated
The branch, v4-18-test has been updated
via c40f1619d96 s3/modules: Fix DFS links when widelinks = yes
via e949750d4f5 s3/modules: Add flag indicating if connected share is a
dfs share
via 5db858c1afd sefltest: Add new regression test dfs with widelinks =
yes
via e50f377b4ab selftest: Add new dfs share (with widelinks enabled)
from ed62f4fabaf dsdb: Use samdb_system_container_dn() in
pdb_samba_dsdb_*()
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-18-test
- Log -
commit c40f1619d96c0332d3ad9d9b8e63a4fbc10f332f
Author: Noel Power
Date: Thu Jul 27 13:26:21 2023 +0100
s3/modules: Fix DFS links when widelinks = yes
In openat(), even if we fail to open the file,
propagate stat if and only if the object is a link in
a DFS share. This allows calling code to further process
the link.
Also remove knownfail
Pair-Programmed-With: Jeremy Alison
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Sat Jul 29 00:43:52 UTC 2023 on atb-devel-224
(cherry picked from commit 0bf8b25aacdf2f5c746922320b32e3f0886c81f5)
Autobuild-User(v4-18-test): Jule Anger
Autobuild-Date(v4-18-test): Thu Aug 3 08:44:47 UTC 2023 on atb-devel-224
commit e949750d4f533d0c2a04ada4a02236f1b012107a
Author: Noel Power
Date: Thu Jul 27 17:36:29 2023 +0100
s3/modules: Add flag indicating if connected share is a dfs share
Not used yet, will be used in the next commit to avoid testing
if the connected share is a dfs one.
Pair-Programmed-With: Jeremy Alison
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit 2668dcd0968133cca4f8410bf8c41ed0483f5d87)
commit 5db858c1afde2fd0a20c81360f03f165eee2d53b
Author: Noel Power
Date: Fri Jul 28 09:41:59 2023 +0100
sefltest: Add new regression test dfs with widelinks = yes
Adds a new test trying to cd into dfs path on share with
widelinks enabled, should generate an error (see BUG:)
Add a knownfail so CI continues
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit 3d2e9db8b95f9f45d486f8272e53584975f177fa)
commit e50f377b4ab853b11ea17778a3e5ea712548bc22
Author: Noel Power
Date: Fri Jul 28 09:40:57 2023 +0100
selftest: Add new dfs share (with widelinks enabled)
Adds share (to be used in later test) that has dfs node
but additionally has widelinks set to yes
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15435
Signed-off-by: Noel Power
Reviewed-by: Jeremy Allison
(cherry picked from commit b57cdfd7efb161cf96b3a39dc7a1652db817e602)
---
Summary of changes:
selftest/target/Samba3.pm | 5
source3/modules/vfs_widelinks.c| 30 +++---
source3/script/tests/test_bug15435_widelink_dfs.sh | 28
source3/selftest/tests.py | 10
4 files changed, 70 insertions(+), 3 deletions(-)
create mode 100755 source3/script/tests/test_bug15435_widelink_dfs.sh
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index d3ee7388026..fb581451801 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -3030,6 +3030,11 @@ sub provision($$)
msdfs root = yes
msdfs shuffle referrals = yes
guest ok = yes
+[msdfs-share-wl]
+ path = $msdfs_shrdir
+ msdfs root = yes
+ wide links = yes
+ guest ok = yes
[msdfs-share2]
path = $msdfs_shrdir2
msdfs root = yes
diff --git a/source3/modules/vfs_widelinks.c b/source3/modules/vfs_widelinks.c
index 2a35ea5eb68..c68468a950b 100644
--- a/source3/modules/vfs_widelinks.c
+++ b/source3/modules/vfs_widelinks.c
@@ -106,6 +106,7 @@
struct widelinks_config {
bool active;
+ bool is_dfs_share;
char *cwd;
};
@@ -134,7 +135,8 @@ static int widelinks_connect(struct vfs_handle_struct
*handle,
DBG_ERR("vfs_widelinks module loaded with "
"widelinks = no\n");
}
-
+ config->is_dfs_share =
+ (lp_host_msdfs() && lp_msdfs_root(SNUM(handle->conn)));
SMB_VFS_HANDLE_SET_DATA(handle,
config,
NULL, /* free_fn */
@@ -346,7 +348,7 @@ static int widelinks_openat(vfs_handle_struct *handle,
{
struct vfs_open_how how = *_how;
struct widelinks_config *config = NULL;
-
+ int ret;
