The branch, v4-10-test has been updated
via b5e8ba021bf s3: VFS: glusterfs: Reset nlinks for symlink entries
during readdir
via 30352214311 Avoiding bad call flags with python 3.8, using
METH_NOARGS instead of zero.
via edeed08a04c pygpo: use correct method flags
from bbeb73b40b8 VERSION: Bump version up to 4.10.12.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-10-test
- Log -----------------------------------------------------------------
commit b5e8ba021bfeb98275d2d739cf9cbb4893d81997
Author: Anoop C S <[email protected]>
Date: Tue Nov 12 19:58:43 2019 +0530
s3: VFS: glusterfs: Reset nlinks for symlink entries during readdir
On receiving an already initialized stat_ex buffer for readdir() call we
invoke readdirplus() GlusterFS API, an optimized variant of readdir(),
which then returns stat information along with dir entry result. But for
symlink entries we don't know if link or target info is needed. In that
case it is better to leave this decision back to caller by resetting
nlinks value inside stat information to make it invalid.
This was also preventing us from displaying msdfs link as directories
inside the share.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14182
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Günther Deschner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Tue Dec 17 21:53:07 UTC 2019 on sn-devel-184
(cherry picked from commit fca2d3e0d1fa5af59e7b729f7c1d126f7b81e149)
Autobuild-User(v4-10-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-10-test): Thu Dec 19 13:46:00 UTC 2019 on sn-devel-144
commit 3035221431130867923a7b85974f1d5faa4b568f
Author: Torsten Fohrer <[email protected]>
Date: Sun Dec 15 16:58:40 2019 +0100
Avoiding bad call flags with python 3.8, using METH_NOARGS instead of zero.
(C) SBE network solutions GmbH
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14209
Signed-off-by: Torsten Fohrer <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Ralph Böhme <[email protected]>
Autobuild-Date(master): Wed Dec 18 14:33:58 UTC 2019 on sn-devel-184
(cherry picked from commit f0eb1e623f76d3dbd0c22f96cabebd1041c147df)
commit edeed08a04c33e1bf77e6a4b6a24e739b60132bb
Author: Douglas Bagnall <[email protected]>
Date: Tue Dec 3 11:17:26 2019 +1300
pygpo: use correct method flags
The METH_KEYWORDS argument must always be combined with METH_VARARGS.
In Python up to 3.7 this was checked at runtime, and as we had no callers to
get_unix_path() in Python we never noticed. In Python 3.8 it is checked at
import time, and everyone notices even if they aren't directly using GPOs.
Found and reported by Val Kulkov.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14209
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
(cherry picked from commit 12cccf3447333dfd4f5e437cd57ca5ec68724fdd)
-----------------------------------------------------------------------
Summary of changes:
libgpo/pygpo.c | 2 +-
source3/modules/vfs_glusterfs.c | 5 ++++-
source4/auth/gensec/pygensec.c | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c
index 4db8cad7ca4..b8dfcd5572f 100644
--- a/libgpo/pygpo.c
+++ b/libgpo/pygpo.c
@@ -117,7 +117,7 @@ out:
}
static PyMethodDef GPO_methods[] = {
- {"get_unix_path", (PyCFunction)py_gpo_get_unix_path, METH_KEYWORDS,
+ {"get_unix_path", (PyCFunction)py_gpo_get_unix_path, METH_VARARGS |
METH_KEYWORDS,
NULL },
{NULL}
};
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index f2f9ab8e32c..cf51f5dd06b 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -560,7 +560,10 @@ static struct dirent *vfs_gluster_readdir(struct
vfs_handle_struct *handle,
}
if (sbuf != NULL) {
- smb_stat_ex_from_stat(sbuf, &stat);
+ SET_STAT_INVALID(*sbuf);
+ if (!S_ISLNK(stat.st_mode)) {
+ smb_stat_ex_from_stat(sbuf, &stat);
+ }
}
END_PROFILE(syscall_readdir);
diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index d27fe28648a..c9f3fd3b489 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -659,7 +659,7 @@ static PyMethodDef py_gensec_security_methods[] = {
"S.have_feature()\n Return True if GENSEC negotiated a
particular feature." },
{ "set_max_update_size", (PyCFunction)py_gensec_set_max_update_size,
METH_VARARGS,
"S.set_max_update_size(max_size) \n Some mechs can fragment
update packets, needs to be use before the mech is started." },
- { "max_update_size", (PyCFunction)py_gensec_max_update_size, 0,
+ { "max_update_size", (PyCFunction)py_gensec_max_update_size,
METH_NOARGS,
"S.max_update_size() \n Return the current max_update_size." },
{ "update", (PyCFunction)py_gensec_update, METH_VARARGS,
"S.update(blob_in) -> (finished, blob_out)\nPerform one step in
a GENSEC dance. Repeat with new packets until finished is true or exception."
},
--
Samba Shared Repository
