[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via cbf23f2b0fb selftest: Confirm new and old SDDL strings differ after a samba-tool dsacl set via 8e2015293e4 selftest: Add test for samba-tool dsacl get, cross-checked with samba-tool dsacl set via 8431cd40c23 samba-tool dsacl: Mark old and new descriptor output correctly via fb7a8064830 Add command "samba-tool dsacl get" This code is very equal to "samba-tool dsacl set", except it only prints out the current sddl of an object. via cf8ff6b821b Update dsacl.py - add_ace to handle/verify sddl parameter correct via d6f6eb4f25a bootstrap/README.md: add README.md via 50a1109c8e4 bootstrap/dists: add rendered files for dists via 26d2f74cc91 bootstrap/docker.py: add cli to build/tag/push docker images via 3737518afea bootstrap/template.py: add cli to render templates via 3803f87f477 bootstrap/config.py: define package lists and templates via 8216a619b48 selftest/tests: add smoketests for dbcheck --quick-membership-checks via e051d787f4d selftest/tests: add helper method to simplify plantestsuite via fa8a8483651 dbcheck: skip reverse member link checks when cli option specified via 5f9a5ef262b s4/param: Fix provision_get_schema leaking python object from 8c92702d152 vfs_ceph: refactor if-error-return-else logic https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit cbf23f2b0fbc7705f6050ddc8b0b925132c4a290 Author: Andrew Bartlett Date: Thu Feb 21 15:53:07 2019 +1300 selftest: Confirm new and old SDDL strings differ after a samba-tool dsacl set Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Feb 21 05:37:31 CET 2019 on sn-devel-144 commit 8e2015293e4798c8c1832633e07eec95a38de624 Author: Andrew Bartlett Date: Thu Feb 21 15:49:25 2019 +1300 selftest: Add test for samba-tool dsacl get, cross-checked with samba-tool dsacl set Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall commit 8431cd40c23c079f92083985fda784cd38159df3 Author: Andrew Bartlett Date: Thu Feb 21 15:33:01 2019 +1300 samba-tool dsacl: Mark old and new descriptor output correctly Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall commit fb7a80648305077a2891f43dd740c5b831cbbc4a Author: Martin Krämer Date: Wed Jan 9 15:13:58 2019 + Add command "samba-tool dsacl get" This code is very equal to "samba-tool dsacl set", except it only prints out the current sddl of an object. Signed-off-by: Martin Krämer Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit cf8ff6b821bce02def8e3846bfbae96e3ebe0778 Author: Martin Krämer Date: Sat Jan 26 09:17:25 2019 + Update dsacl.py - add_ace to handle/verify sddl parameter correct Test for samba-tool dsacl set --sddl parmeter Update tests.py - add dsacl (dsacl.py / samba-tool dsacl set) test Signed-off-by: Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit d6f6eb4f25aca1a55709feb1f87afc01cb851d8b Author: Joe Guo Date: Fri Feb 8 16:28:18 2019 +1300 bootstrap/README.md: add README.md Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 50a1109c8e42c9a6ca64e46b093183bff3abc0d1 Author: Joe Guo Date: Tue Feb 12 13:01:17 2019 +1300 bootstrap/dists: add rendered files for dists Add these into repo, then we can link it to samba wiki, for people to get a latest and precise pkg list Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 26d2f74cc915d4499a6abfedc9034e60f33a3138 Author: Joe Guo Date: Mon Feb 18 12:47:50 2019 +1300 bootstrap/docker.py: add cli to build/tag/push docker images Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 3737518afeaf26bbb0afa534a453d19e92d923cd Author: Joe Guo Date: Mon Feb 18 12:31:28 2019 +1300 bootstrap/template.py: add cli to render templates - bootstrap for each dist - Dockerfile for each dist - Vagrantfile all in one Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 3803f87f4776b3729d8033cf6ae09120fa4f3c54 Author: Joe Guo Date: Thu Feb 7 14:07:33 2019 +1300 bootstrap/config.py: define package lists and templates Define default pkg list, and allow to override for each dist. Also define bootstrap/Dockerfile/Vagrantfile templates. Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 8216a619b480dbc18f72ea2215624fe7d4781a75 Author: Joe Guo Date: Fri Feb 15 22:55:51 2019 +1300 selftest/tests: add
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated
via 70bc551 README: Create a markdown file
via 5cc0681 gitlab-ci: Check last 20 commits on force push
via 066d850 cmake: Remove unused config.h variables
via 9a9250a cmake: Use GNUInstallDirs
from 24e5973 swrap: Fix a TODO
https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master
- Log -
commit 70bc551dca142a7a4d6ed082244966957ca2e070
Author: Andreas Schneider
Date: Tue Feb 19 16:18:10 2019 +0100
README: Create a markdown file
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
commit 5cc06814060cd99245e7f072da077e5227d7698d
Author: Andreas Schneider
Date: Tue Feb 19 16:10:16 2019 +0100
gitlab-ci: Check last 20 commits on force push
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
commit 066d850c2853095bf756e7f5e9aeb198f6775b23
Author: Andreas Schneider
Date: Wed Feb 20 10:34:04 2019 +0100
cmake: Remove unused config.h variables
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
commit 9a9250a79143df88c3100e509e29c00536045b6b
Author: Andreas Schneider
Date: Fri Feb 15 13:09:28 2019 +0100
cmake: Use GNUInstallDirs
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
---
Summary of changes:
.gitlab-ci.yml | 4 +-
CMakeLists.txt | 6 +-
CPackConfig.cmake | 2 +-
ConfigureChecks.cmake | 4 -
README => README.md | 6 +-
cmake/Modules/DefineInstallationPaths.cmake | 109
config.h.cmake | 5 --
doc/CMakeLists.txt | 2 +-
socket_wrapper-config.cmake.in | 2 +-
socket_wrapper.pc.cmake | 2 +-
src/CMakeLists.txt | 10 +--
11 files changed, 16 insertions(+), 136 deletions(-)
rename README => README.md (74%)
delete mode 100644 cmake/Modules/DefineInstallationPaths.cmake
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2bb099..365d834 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,12 +82,12 @@ fedora/csbuild:
script:
- |
if [[ -z "$CI_COMMIT_BEFORE_SHA" ]]; then
-export CI_COMMIT_BEFORE_SHA=$(git rev-parse HEAD^)
+export CI_COMMIT_BEFORE_SHA=$(git rev-parse "${CI_COMMIT_SHA}~20")
fi
# Check if the commit exists in this branch
# This is not the case for a force push
-git branch --contains $CI_COMMIT_BEFORE_SHA 2>/dev/null || export
CI_COMMIT_BEFORE_SHA=$(git rev-parse HEAD^)
+git branch --contains $CI_COMMIT_BEFORE_SHA 2>/dev/null || export
CI_COMMIT_BEFORE_SHA=$(git rev-parse "${CI_COMMIT_SHA}~20")
export CI_COMMIT_RANGE="$CI_COMMIT_BEFORE_SHA..$CI_COMMIT_SHA"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38b3e17..1a161dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,10 +28,10 @@ set(LIBRARY_SOVERSION "0")
# add definitions
include(DefinePlatformDefaults)
-include(DefineInstallationPaths)
include(DefineOptions.cmake)
include(CPackConfig.cmake)
include(CompilerChecks.cmake)
+include(GNUInstallDirs)
# disallow in-source build
include(MacroEnsureOutOfSourceBuild)
@@ -63,7 +63,7 @@ install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper.pc
DESTINATION
-${LIB_INSTALL_DIR}/pkgconfig
+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig
COMPONENT
pkgconfig
)
@@ -76,7 +76,7 @@ install(
${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper-config-version.cmake
${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper-config.cmake
DESTINATION
-${CMAKE_INSTALL_DIR}/socket_wrapper
+${CMAKE_INSTALL_LIBDIR}/cmake/socket_wrapper
COMPONENT
devel
)
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index 6cf14a6..11b0314 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -4,7 +4,7 @@
### general settings
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The SSH library")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
set(CPACK_PACKAGE_VENDOR "The SSH Library Development Team")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6cedb90..81aaa1c 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -9,10 +9,6 @@ include(TestBigEndian)
set(PACKAGE ${PROJECT_NAME})
set(VERSION ${PROJECT_VERSION})
-set(DATADIR ${DATA_INSTALL_DIR})
-set(LIBDIR ${LIB_INSTALL_DIR})
-set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
-set(SYSCONFDIR
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8c92702d152 vfs_ceph: refactor if-error-return-else logic
via 9c2d15c254b vfs_glusterfs: check for VFS_ADD_FSP_EXTENSION() failure
from d4baed454fb WHATSNEW: winbind authentication logging
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8c92702d152e16277b658be81496a60841a03e85
Author: David Disseldorp
Date: Tue Feb 19 00:33:06 2019 +0100
vfs_ceph: refactor if-error-return-else logic
vfs_ceph has quite a few occurrences of:
if (result < 0) {
WRAP_RETURN(result);/* calls return */
} else {
...
}
This change drops the superfluous else {} encapsulation and also removes
duplication of ceph statx debug messages.
Signed-off-by: David Disseldorp
Reviewed-by: Guenther Deschner
Autobuild-User(master): Günther Deschner
Autobuild-Date(master): Wed Feb 20 13:56:09 CET 2019 on sn-devel-144
commit 9c2d15c254b6b3f7c46d72c7fe22a402ef110a64
Author: David Disseldorp
Date: Mon Feb 18 17:41:08 2019 +0100
vfs_glusterfs: check for VFS_ADD_FSP_EXTENSION() failure
Signed-off-by: David Disseldorp
Reviewed-by: Guenther Deschner
---
Summary of changes:
source3/modules/vfs_ceph.c | 102 +++-
source3/modules/vfs_glusterfs.c | 10 +++-
2 files changed, 58 insertions(+), 54 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index d863c8add5a..60afd73efe6 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -260,19 +260,20 @@ static int cephwrap_statvfs(struct vfs_handle_struct
*handle,
ret = ceph_statfs(handle->data, smb_fname->base_name, _buf);
if (ret < 0) {
WRAP_RETURN(ret);
- } else {
- statbuf->OptimalTransferSize = statvfs_buf.f_frsize;
- statbuf->BlockSize = statvfs_buf.f_bsize;
- statbuf->TotalBlocks = statvfs_buf.f_blocks;
- statbuf->BlocksAvail = statvfs_buf.f_bfree;
- statbuf->UserBlocksAvail = statvfs_buf.f_bavail;
- statbuf->TotalFileNodes = statvfs_buf.f_files;
- statbuf->FreeFileNodes = statvfs_buf.f_ffree;
- statbuf->FsIdentifier = statvfs_buf.f_fsid;
- DBG_DEBUG("[CEPH] f_bsize: %ld, f_blocks: %ld, f_bfree: %ld,
f_bavail: %ld\n",
- (long int)statvfs_buf.f_bsize, (long
int)statvfs_buf.f_blocks,
- (long int)statvfs_buf.f_bfree, (long
int)statvfs_buf.f_bavail);
}
+
+ statbuf->OptimalTransferSize = statvfs_buf.f_frsize;
+ statbuf->BlockSize = statvfs_buf.f_bsize;
+ statbuf->TotalBlocks = statvfs_buf.f_blocks;
+ statbuf->BlocksAvail = statvfs_buf.f_bfree;
+ statbuf->UserBlocksAvail = statvfs_buf.f_bavail;
+ statbuf->TotalFileNodes = statvfs_buf.f_files;
+ statbuf->FreeFileNodes = statvfs_buf.f_ffree;
+ statbuf->FsIdentifier = statvfs_buf.f_fsid;
+ DBG_DEBUG("[CEPH] f_bsize: %ld, f_blocks: %ld, f_bfree: %ld, f_bavail:
%ld\n",
+ (long int)statvfs_buf.f_bsize, (long int)statvfs_buf.f_blocks,
+ (long int)statvfs_buf.f_bfree, (long int)statvfs_buf.f_bavail);
+
return ret;
}
@@ -676,9 +677,21 @@ static int cephwrap_fsync_recv(struct tevent_req *req,
static void init_stat_ex_from_ceph_statx(struct stat_ex *dst, const struct
ceph_statx *stx)
{
- if ((stx->stx_mask & SAMBA_STATX_ATTR_MASK) != SAMBA_STATX_ATTR_MASK)
+ DBG_DEBUG("[CEPH]\tstx = {dev = %llx, ino = %llu, mode = 0x%x, "
+ "nlink = %llu, uid = %d, gid = %d, rdev = %llx, size = %llu, "
+ "blksize = %llu, blocks = %llu, atime = %llu, mtime = %llu, "
+ "ctime = %llu, btime = %llu}\n",
+ llu(stx->stx_dev), llu(stx->stx_ino), stx->stx_mode,
+ llu(stx->stx_nlink), stx->stx_uid, stx->stx_gid,
+ llu(stx->stx_rdev), llu(stx->stx_size), llu(stx->stx_blksize),
+ llu(stx->stx_blocks), llu(stx->stx_atime.tv_sec),
+ llu(stx->stx_mtime.tv_sec), llu(stx->stx_ctime.tv_sec),
+ llu(stx->stx_btime.tv_sec));
+
+ if ((stx->stx_mask & SAMBA_STATX_ATTR_MASK) != SAMBA_STATX_ATTR_MASK) {
DBG_WARNING("%s: stx->stx_mask is incorrect (wanted %x, got
%x)",
__func__, SAMBA_STATX_ATTR_MASK, stx->stx_mask);
+ }
dst->st_ex_dev = stx->stx_dev;
dst->st_ex_rdev = stx->stx_rdev;
@@ -715,16 +728,8 @@ static int cephwrap_stat(struct vfs_handle_struct *handle,
DBG_DEBUG("[CEPH] statx(...) = %d\n", result);
if (result < 0) {
WRAP_RETURN(result);
-
