[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3794fa0 Changes in samba vxfs plugin. from 0e9fcc3 vfs_snapper man page: Fixed typo https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3794fa0a9833665492952680a2ffac6653eed5e0 Author: Pooja MahadikDate: Sun Aug 27 17:24:32 2017 +0530 Changes in samba vxfs plugin. Implemented two VFS operations(set/fset dos attribute) for vxfs plugin. Trapping set/clear of read-only attribute. Signed-off-by: Pooja Mahadik Reviewed-by: Ralph Böhme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Sep 30 06:42:10 CEST 2017 on sn-devel-144 --- Summary of changes: source3/modules/lib_vxfs.c | 113 + source3/modules/vfs_vxfs.c | 89 +++ source3/modules/vfs_vxfs.h | 9 3 files changed, 211 insertions(+) Changeset truncated at 500 lines: diff --git a/source3/modules/lib_vxfs.c b/source3/modules/lib_vxfs.c index 0d5ea60..f9394d6 100644 --- a/source3/modules/lib_vxfs.c +++ b/source3/modules/lib_vxfs.c @@ -22,6 +22,7 @@ #include "smbd/smbd.h" #include "system/filesys.h" #include "string.h" +#include "vfs_vxfs.h" /* * Available under GPL at @@ -36,6 +37,9 @@ static int (*vxfs_getxattr_fd_func) (int fd, const char *name, void *value, size_t *len); static int (*vxfs_removexattr_fd_func) (int fd, const char *name); static int (*vxfs_listxattr_fd_func) (int fd, void *value, size_t *len); +static int (*vxfs_setwxattr_fd_func) (int fd); +static int (*vxfs_clearwxattr_fd_func) (int fd); +static int (*vxfs_checkwxattr_fd_func) (int fd); int vxfs_setxattr_fd(int fd, const char *name, const void *value, size_t len, int flags) @@ -202,6 +206,109 @@ int vxfs_listxattr_path(const char *path, char *list, size_t size) return ret; } +int vxfs_setwxattr_fd(int fd) +{ + int ret = 0; + + if (vxfs_setwxattr_fd_func == NULL) { + errno = ENOSYS; + return -1; + } + ret = vxfs_setwxattr_fd_func(fd); + DBG_DEBUG("ret = %d\n", ret); + if (ret != 0) { + errno = ret; + ret = -1; + } + + return ret; +} + +int vxfs_setwxattr_path(const char *path) +{ + int ret, fd = -1; + + fd = open(path, O_WRONLY); + if (fd == -1) { + DBG_DEBUG("file %s not opened, errno:%s\n", + path, strerror(errno)); + return -1; + } + + ret = vxfs_setwxattr_fd(fd); + DBG_DEBUG("ret = %d\n", ret); + close(fd); + + return ret; +} + +int vxfs_clearwxattr_fd(int fd) +{ + int ret; + if (vxfs_clearwxattr_fd_func == NULL) { + errno = ENOSYS; + return -1; + } + ret = vxfs_clearwxattr_fd_func(fd); + DBG_DEBUG("ret = %d\n", ret); + if (ret != 0) { + errno = ret; + ret = -1; + } + + return ret; +} + +int vxfs_clearwxattr_path(const char *path) +{ + int ret, fd = -1; + + fd = open(path, O_WRONLY); + if (fd == -1) { + DBG_DEBUG("file %s not opened, errno:%s\n", + path, strerror(errno)); + return -1; + } + ret = vxfs_clearwxattr_fd(fd); + DBG_DEBUG("ret = %d\n", ret); + close(fd); + + return ret; +} + +int vxfs_checkwxattr_fd(int fd) +{ + int ret; + + if (vxfs_checkwxattr_fd_func == NULL) { + errno = ENOSYS; + return -1; + } + ret = vxfs_checkwxattr_fd_func(fd); + DBG_DEBUG("ret = %d\n", ret); + if (ret != 0) { + errno = ret; + ret = -1; + } + return ret; +} + +int vxfs_checkwxattr_path(const char *path) +{ + int ret, fd = -1; + + fd = open(path, O_WRONLY); + if (fd == -1) { + DBG_DEBUG("file %s not opened, errno:%s\n", + path, strerror(errno)); + return -1; + } + ret = vxfs_checkwxattr_fd(fd); + close(fd); + + return ret; +} + static bool load_lib_vxfs_function(void *lib_handle, void *fn_ptr, const char *fnc_name) { @@ -240,5 +347,11 @@ void vxfs_init() "vxfs_nxattr_remove"); load_lib_vxfs_function(_handle, _listxattr_fd_func, "vxfs_nxattr_list"); + load_lib_vxfs_function(_handle, _setwxattr_fd_func, + "vxfs_wattr_set"); + load_lib_vxfs_function(_handle, _clearwxattr_fd_func, +
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0e9fcc3 vfs_snapper man page: Fixed typo from 2c50bdf docs: Improve wording around 'winbind expand groups' param https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0e9fcc3e7506dff01c3062893eace6beef5781a1 Author: Marc MuehlfeldDate: Fri Sep 29 18:34:25 2017 +0200 vfs_snapper man page: Fixed typo This commit corrects a small typo in vfs_snapper manpage. Signed-off-by: Yvan Masson Reviewed-by: Marc Muehlfeld Autobuild-User(master): Marc Muehlfeld Autobuild-Date(master): Sat Sep 30 02:41:46 CEST 2017 on sn-devel-144 --- Summary of changes: docs-xml/manpages/vfs_snapper.8.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/vfs_snapper.8.xml b/docs-xml/manpages/vfs_snapper.8.xml index 0cc223f..bc045c3 100644 --- a/docs-xml/manpages/vfs_snapper.8.xml +++ b/docs-xml/manpages/vfs_snapper.8.xml @@ -55,7 +55,7 @@ The underlying share path must have a corresponding snapper configuration file. The snapshot directory tree must allow - access for relavent users. + access for relevant users. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2c50bdf docs: Improve wording around 'winbind expand groups' param from 05beefd s3:winbind: unmapped Unix users must be resolved locally https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2c50bdfed06e7eff645a76dad8971eb425c3165e Author: Noel PowerDate: Thu Sep 28 12:28:46 2017 +0100 docs: Improve wording around 'winbind expand groups' param Signed-off-by: Noel Power Reviewed-by: Volker Lendecke Reviewed-by: Jim McDonough Autobuild-User(master): Jim McDonough Autobuild-Date(master): Fri Sep 29 22:37:08 CEST 2017 on sn-devel-144 --- Summary of changes: docs-xml/smbdotconf/winbind/winbindexpandgroups.xml | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml b/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml index 941ba04..5a05ecf 100644 --- a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml +++ b/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml @@ -12,16 +12,23 @@ parameter specifically applies to the membership of domain groups. +This option also affects the return of non nested +group memberships of Windows domain users. With the +new default "winbind expand groups = 0" winbind does +not query group memberships at all. + Be aware that a high value for this parameter can result in system slowdown as the main parent winbindd daemon must perform the group unrolling and will be unable to answer incoming NSS or authentication requests during this time. The default value was changed from 1 to 0 with Samba 4.2. - Some broken applications calculate the group memberships of + Some broken applications (including some implementations of + newgrp and sg) calculate the group memberships of users by traversing groups, such applications will require - "winbind expand groups = 1". But the new default makes winbindd more reliable - as it doesn't require SAMR access to domain controllers of trusted domains. + "winbind expand groups = 1". But the new default makes winbindd + more reliable as it doesn't require SAMR access to domain + controllers of trusted domains. 0 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 05beefd s3:winbind: unmapped Unix users must be resolved locally via 196bd54 s3:winbind: unmapped Unix groups in getgrgid must be resolved locally from 7e728c8 notifyd: Broadcast to all connected nodes https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 05beefd50a4812389be94513c8fa22a60f5c5e85 Author: Ralph WuerthnerDate: Tue Sep 26 15:57:53 2017 +0200 s3:winbind: unmapped Unix users must be resolved locally Signed-off-by: Ralph Wuerthner Reviewed-by: Christof Schmitt Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Fri Sep 29 18:33:21 CEST 2017 on sn-devel-144 commit 196bd5456355e93e4a7afd4a1ffdc49fd4ea46e7 Author: Ralph Wuerthner Date: Tue Sep 26 15:56:56 2017 +0200 s3:winbind: unmapped Unix groups in getgrgid must be resolved locally Signed-off-by: Ralph Wuerthner Reviewed-by: Christof Schmitt Reviewed-by: Volker Lendecke --- Summary of changes: source3/winbindd/wb_getgrsid.c | 6 ++ source3/winbindd/wb_getpwsid.c | 6 ++ 2 files changed, 12 insertions(+) Changeset truncated at 500 lines: diff --git a/source3/winbindd/wb_getgrsid.c b/source3/winbindd/wb_getgrsid.c index acfedf6..8e0eac7 100644 --- a/source3/winbindd/wb_getgrsid.c +++ b/source3/winbindd/wb_getgrsid.c @@ -53,6 +53,12 @@ struct tevent_req *wb_getgrsid_send(TALLOC_CTX *mem_ctx, state->ev = ev; state->max_nesting = max_nesting; + if (dom_sid_in_domain(_sid_Unix_Groups, group_sid)) { + /* unmapped Unix groups must be resolved locally */ + tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); + return tevent_req_post(req, ev); + } + if (lp_winbind_trusted_domains_only()) { struct winbindd_domain *our_domain = find_our_domain(); diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c index e9ffc33..dcb2492 100644 --- a/source3/winbindd/wb_getpwsid.c +++ b/source3/winbindd/wb_getpwsid.c @@ -47,6 +47,12 @@ struct tevent_req *wb_getpwsid_send(TALLOC_CTX *mem_ctx, state->ev = ev; state->pw = pw; + if (dom_sid_in_domain(_sid_Unix_Users, user_sid)) { + /* unmapped Unix users must be resolved locally */ + tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); + return tevent_req_post(req, ev); + } + subreq = wb_queryuser_send(state, ev, >sid); if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 7e728c8 notifyd: Broadcast to all connected nodes from 099df25 source4 smbd: remove global control pipe from process_standard. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7e728c86c77d995809a68dfb26350052303ca122 Author: Amitay IsaacsDate: Thu Sep 28 11:44:50 2017 +1000 notifyd: Broadcast to all connected nodes CTDB_BROADCAST_VNNMAP includes only the nodes with lmaster roles. CTDB_BROADCAST_CONNECTED includes all the running nodes. Signed-off-by: Amitay Isaacs Reviewed-by: Volker Lendecke Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Fri Sep 29 08:38:10 CEST 2017 on sn-devel-144 --- Summary of changes: source3/smbd/notifyd/notifyd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c index f645781..e4e5c78 100644 --- a/source3/smbd/notifyd/notifyd.c +++ b/source3/smbd/notifyd/notifyd.c @@ -81,7 +81,7 @@ struct notifyd_state { * broadcasts its messaging_reclog to every other notifyd in * the cluster. This is done by making ctdb send a message to * srvid CTDB_SRVID_SAMBA_NOTIFY_PROXY with destination node -* number CTDB_BROADCAST_VNNMAP. Everybody in the cluster who +* number CTDB_BROADCAST_CONNECTED. Everybody in the cluster who * had called register_with_ctdbd this srvid will receive the * broadcasts. * @@ -999,7 +999,7 @@ static void notifyd_broadcast_reclog(struct ctdbd_connection *ctdbd_conn, .iov_len = blob.length }; ret = ctdbd_messaging_send_iov( - ctdbd_conn, CTDB_BROADCAST_VNNMAP, + ctdbd_conn, CTDB_BROADCAST_CONNECTED, CTDB_SRVID_SAMBA_NOTIFY_PROXY, iov, ARRAY_SIZE(iov)); TALLOC_FREE(blob.data); if (ret != 0) { -- Samba Shared Repository