Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked
in at 2017-04-17 10:22:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba"
Mon Apr 17 10:22:20 2017 rev:210 rq:487103 version:4.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2017-03-13
15:30:25.936149714 +0100
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2017-04-17
10:22:22.155710220 +0200
@@ -2 +2 @@
-Mon Feb 27 15:30:21 UTC 2017 - dims...@opensuse.org
+Mon Apr 10 13:52:40 UTC 2017 - dd...@suse.com
@@ -4,3 +4,60 @@
-- Change insserv_prereq requires to requires(pre): this is
- factually seen not a runtime requirement of samba, but of the
- rpm scriptlets.
+- Update to 4.6.2
+ + remove bso#12721 patches now upstream
+
+-------------------------------------------------------------------
+Fri Apr 7 12:59:26 UTC 2017 - dd...@suse.com
+
+- Enable samba-ceph build for openSUSE and SLE12SP3+; (fate#321622).
+ + x86-64 and aarch64
+
+-------------------------------------------------------------------
+Mon Apr 3 14:01:25 UTC 2017 - dd...@suse.com
+
+- Enable librados CTDB lock helper for samba-ceph package; (fate#321622).
+
+-------------------------------------------------------------------
+Thu Mar 30 17:18:54 UTC 2017 - dmul...@suse.com
+
+- Build and install the html man pages (bsc#1021907).
+
+-------------------------------------------------------------------
+Thu Mar 30 12:33:39 UTC 2017 - nopo...@suse.com
+
+- Fix CVE-2017-2619 regression with "follow symlinks = no";
+ (bso#12721).
+
+-------------------------------------------------------------------
+Wed Mar 22 13:15:12 UTC 2017 - jmcdono...@suse.com
+
+- Update to 4.6.1
+ + symlink race permits opening files outside share directory;
+ CVE-2017-2619; (bso#12496); (bsc#1027147)
+ + testparm checks for valid idmap parameters
+ + add new krb client encryption types
+ + support for printer driver upload from windows 10
+ + inherit owner = 'unix only' for improved quota support
+ + improved CTDB event support
+ + new primary group support for idmap_ad
+ + idmap_hash deprecated
+ + mvxattr added to recursively rename extended attributes
+
+-------------------------------------------------------------------
+Wed Mar 15 11:50:50 UTC 2017 - aap...@suse.com
+
+- Remove chkconfig requirements for systemd systems
+
+-------------------------------------------------------------------
+Mon Mar 13 15:14:58 UTC 2017 - ku...@suse.com
+
+ - Don't call insserv if systemd is used
+
+-------------------------------------------------------------------
+Fri Feb 10 23:00:14 CET 2017 - ku...@suse.de
+
+- Fix check if we need to require insserv
+
+-------------------------------------------------------------------
+Mon Feb 6 18:35:29 UTC 2017 - aap...@suse.com
+
+- Force usage of ncurses6-config thru NCURSES_CONFIG env var;
+ (bsc#1023847).
Old:
----
samba-4.5.3.tar.asc
samba-4.5.3.tar.gz
New:
----
samba-4.6.2.tar.asc
samba-4.6.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.eRyShM/_old 2017-04-17 10:22:23.591506879 +0200
+++ /var/tmp/diff_new_pack.eRyShM/_new 2017-04-17 10:22:23.595506313 +0200
@@ -21,13 +21,14 @@
%if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
%define build_ctdb_pmda 1
%endif
-%if 0%{?suse_version} > 1320
-%ifarch x86_64
-%define build_vfs_ceph 1
+%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200
+%ifarch aarch64 x86_64
+%define build_ceph 1
%endif
%endif
Name: samba
+BuildRequires: autoconf
BuildRequires: cups-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: e2fsprogs-devel
@@ -125,10 +126,11 @@
%if 0%{?build_ctdb_pmda}
BuildRequires: libpcp-devel
%endif
-%if 0%{?build_vfs_ceph}
+%if 0%{?build_ceph}
BuildRequires: libcephfs-devel
+BuildRequires: librados-devel
%endif
-%define samba_ver 4.5.3
+%define samba_ver 4.6.2
%define samba_ver_suffix %nil
%if "%{samba_ver_suffix}" == ""
%define samba_source_location
https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -150,11 +152,11 @@
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
-%define SOURCE_TIMESTAMP 0
+%define SOURCE_TIMESTAMP 3760
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
-Version: 4.5.3
+Version: 4.6.2
Release: 0
Url: https://www.samba.org/
Obsoletes: samba-gplv3 < %{version}
@@ -262,10 +264,10 @@
Provides: smbfs
Obsoletes: samba-gplv3-client < %{version}
Obsoletes: samba-client-gplv2 < %{version}
-%if 0%{?suse_version} > 0
-Requires(pre): %{?insserv_prereq}
-%endif
+%if 0%{?suse_version} < 1221
+Requires: %{?insserv_prereq}
Requires: /sbin/chkconfig
+%endif
Requires: /sbin/ldconfig
Requires: coreutils
%{?systemd_requires}
@@ -416,8 +418,8 @@
Recommends: logrotate
Recommends: /usr/sbin/nscd
%endif
-%if 0%{?suse_version} > 0
-Requires(pre): %{?insserv_prereq}
+%if 0%{?suse_version} < 1221
+Requires: %{?insserv_prereq}
%endif
Requires: /sbin/ldconfig
Requires: /usr/sbin/groupadd
@@ -1035,15 +1037,17 @@
Source Timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
-%if 0%{?build_vfs_ceph}
+%if 0%{?build_ceph}
%package ceph
-Summary: Ceph VFS Module for Samba
+Summary: Ceph specific add-ons for Samba
License: GPL-3.0+
Group: Productivity/Networking/Samba
Requires: samba = %{version}
%description ceph
-The Ceph VFS module for Samba allows shares to be backed by the Ceph
distributed file system.
+The Ceph VFS module for Samba allows shares to be backed by the Ceph
+distributed file system. A Ceph CTDB lock helper binary is included so
+that RADOS locks can be used for CTDB split-brain avoidance.
%endif
@@ -1101,6 +1105,10 @@
sed -e
"s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=${vendor_tag}%{VENDOR}${product_suffix}/"
VERSION.orig >VERSION
%build
+if command -v ncurses6-config &> /dev/null; then
+ export NCURSES_CONFIG="$(command -v ncurses6-config)"
+fi
+
export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE
-DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
%if 0%{?suse_version} && 0%{?suse_version} < 1141
%{?suse_update_config:%{suse_update_config -f}}
@@ -1126,6 +1134,9 @@
%endif
--enable-fhs \
--with-cluster-support \
+%if 0%{?build_ceph}
+ --enable-ceph-reclock \
+%endif
--with-pam \
--with-pammodulesdir=%{_lib}/security \
--with-piddir=%{PIDDIR} \
@@ -1141,12 +1152,17 @@
%if ! %with_dc
--without-ad-dc \
%endif
- --bundled-libraries=NONE,socket_wrapper,${bundled_libraries_extra} \
+
--bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \
"
./configure ${CONFIGURE_OPTIONS}
make %{build_make_smp_mflags} \
all
+pushd docs-xml
+autoconf && ./configure
+XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
make htmlman
+popd
+
pushd pidl
%{__perl} Makefile.PL INSTALLDIRS=vendor
popd
@@ -1349,6 +1365,7 @@
install -m 0644 docu/Samba.desktop
%{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop
install -d -m 0755 -p ../docs/htmldocs
install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html
+install -m 0644 ../docs-xml/output/htmldocs/manpages/* ../docs/htmldocs/
popd
# winbind stuff
install -m 0644 examples/pam_winbind/pam_winbind.conf
%{buildroot}/%{_sysconfdir}/security/pam_winbind.conf
@@ -1365,7 +1382,7 @@
# cups SMB support
mkdir -p %{buildroot}/%{cups_lib_dir}/backend/
touch %{buildroot}/%{cups_lib_dir}/backend/smb
-mv COPYING README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/
+mv COPYING README WHATSNEW.txt %{buildroot}/%{DOCDIR}/
cp -a docs/* %{buildroot}/%{DOCDIR}
rmdir "%{buildroot}/%{DOCBOOKDIR}"
cp -a examples/ %{buildroot}/%{DOCDIR}
@@ -1388,7 +1405,7 @@
for file in %{buildroot}%{_mandir}/man8/vfs_*; do
case "${file#%{buildroot}}" in
%{_mandir}/man8/vfs_ceph.8)
- %if 0%{?build_vfs_ceph} == 0
+ %if 0%{?build_ceph} == 0
rm ${file}
%endif
continue
@@ -1528,7 +1545,9 @@
%postun client
/sbin/ldconfig
+%if 0%{?suse_version} < 1221
%{?insserv_cleanup:%{insserv_cleanup}}
+%endif
%post -n libdcerpc-binding0 -p /sbin/ldconfig
%postun -n libdcerpc-binding0 -p /sbin/ldconfig
@@ -1791,6 +1810,7 @@
%{_bindir}/smbtar
%{_bindir}/smbtree
%{_bindir}/testparm
+%{_bindir}/mvxattr
%dir %{cups_lib_dir}
%dir %{cups_lib_dir}/backend
%ghost %{cups_lib_dir}/backend/smb
@@ -1819,6 +1839,7 @@
%{_mandir}/man1/smbtar.1.*
%{_mandir}/man1/smbtree.1.*
%{_mandir}/man1/testparm.1.*
+%{_mandir}/man1/mvxattr.1.*
%{_mandir}/man5/lmhosts.5.*
%{_mandir}/man5/smb.conf.5.*
%{_mandir}/man5/smbgetrc.5.*
@@ -1977,7 +1998,6 @@
%{_libdir}/samba/libsmbd-shim-samba4.so
%{_libdir}/samba/libsmbldaphelper-samba4.so
%{_libdir}/samba/libsmbpasswdparser-samba4.so
-%{_libdir}/samba/libsmbregistry-samba4.so
%{_libdir}/samba/libsocket-blocking-samba4.so
%{_libdir}/samba/libsys-rw-samba4.so
%{_libdir}/samba/libtalloc-report-samba4.so
@@ -2150,10 +2170,12 @@
%{_bindir}/onnode
%{_bindir}/ping_pong
%dir %{_libdir}/ctdb
-%{_libdir}/ctdb/ctdb_event_helper
+%{_libdir}/ctdb/ctdb_event
+%{_libdir}/ctdb/ctdb_eventd
%{_libdir}/ctdb/ctdb_lock_helper
%{_libdir}/ctdb/ctdb_natgw
%{_libdir}/ctdb/ctdb_recovery_helper
+%{_libdir}/ctdb/ctdb_takeover_helper
%{_libdir}/ctdb/smnotify
%{_libdir}/ctdb/ctdb_killtcp
%{_libdir}/ctdb/ctdb_lvs
@@ -2197,54 +2219,10 @@
%files -n ctdb-tests
%defattr(-,root,root)
%dir %{_libdir}/ctdb
-%dir %{_libdir}/ctdb/tests
-%{_libdir}/ctdb/tests/comm_client_test
-%{_libdir}/ctdb/tests/comm_server_test
-%{_libdir}/ctdb/tests/comm_test
-%{_libdir}/ctdb/tests/db_hash_test
-%{_libdir}/ctdb/tests/ctdb_takeover_tests
-%{_libdir}/ctdb/tests/pkt_read_test
-%{_libdir}/ctdb/tests/pkt_write_test
-%{_libdir}/ctdb/tests/protocol_client_test
-%{_libdir}/ctdb/tests/protocol_types_test
-%{_libdir}/ctdb/tests/rb_test
-%{_libdir}/ctdb/tests/reqid_test
-%{_libdir}/ctdb/tests/srvid_test
-%{_libdir}/ctdb/tests/ctdb_packet_parse
-%{_libdir}/ctdb/tests/fake_ctdbd
-%{_libdir}/ctdb/tests/fetch_loop
-%{_libdir}/ctdb/tests/fetch_loop_key
-%{_libdir}/ctdb/tests/fetch_readonly
-%{_libdir}/ctdb/tests/fetch_readonly_loop
-%{_libdir}/ctdb/tests/fetch_ring
-%{_libdir}/ctdb/tests/g_lock_loop
-%{_libdir}/ctdb/tests//lock_tdb
-%{_libdir}/ctdb/tests/message_ring
-%{_libdir}/ctdb/tests/porting_tests
-%{_libdir}/ctdb/tests/transaction_loop
-%{_libdir}/ctdb/tests/update_record
-%{_libdir}/ctdb/tests/update_record_persistent
-%{_libdir}/ctdb/tests/pidfile_test
+%{_libdir}/ctdb/tests/
%dir %{_datadir}/ctdb
-%dir %{_datadir}/ctdb/tests
-%dir %{_datadir}/ctdb/tests/eventscripts
-%dir %{_datadir}/ctdb/tests/eventscripts/etc-ctdb
-%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/events.d
-%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/functions
-%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/nfs-checks.d
-%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/nfs-linux-kernel-callout
-%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/statd-callout
-%dir %{_datadir}/ctdb/tests/onnode
-%{_datadir}/ctdb/tests/onnode/functions
-%dir %{_datadir}/ctdb/tests/scripts
-%{_datadir}/ctdb/tests/scripts/common.sh
-%{_datadir}/ctdb/tests/scripts/integration.bash
-%{_datadir}/ctdb/tests/scripts/test_wrap
-%{_datadir}/ctdb/tests/scripts/unit.sh
-%{_datadir}/ctdb/tests/scripts/script_install_paths.sh
-%dir %{_datadir}/ctdb/tests/simple
-%{_datadir}/ctdb/tests/simple/functions
-%{_datadir}/ctdb/tests/simple/nodes
+%{_datadir}/ctdb/tests
+
%files -n libdcerpc-binding0
%defattr(-,root,root)
@@ -2422,7 +2400,6 @@
%_includedir/samba-4.0/util/substitute.h
%_includedir/samba-4.0/util/talloc_stack.h
%_includedir/samba-4.0/util/time.h
-%_includedir/samba-4.0/util/xfile.h
%_libdir/libsamba-util.so
%_libdir/pkgconfig/samba-util.pc
@@ -2492,11 +2469,13 @@
%{_libdir}/libwbclient.so
%{_libdir}/pkgconfig/wbclient.pc
-%if 0%{?build_vfs_ceph}
+%if 0%{?build_ceph}
%files ceph
%defattr(-,root,root)
%{_mandir}/man8/vfs_ceph.8.*
%{_libdir}/samba/vfs/ceph.so
+%{_mandir}/man7/ctdb_mutex_ceph_rados_helper.7.*
+%{_libdir}/ctdb/ctdb_mutex_ceph_rados_helper
%endif
%changelog
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/samba.org/0001-VFS-convert-to-using-ceph_statx-structures-and-funct.patch
new/patches/samba.org/0001-VFS-convert-to-using-ceph_statx-structures-and-funct.patch
---
old/patches/samba.org/0001-VFS-convert-to-using-ceph_statx-structures-and-funct.patch
2017-01-25 17:57:06.000000000 +0100
+++
new/patches/samba.org/0001-VFS-convert-to-using-ceph_statx-structures-and-funct.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,274 +0,0 @@
-From a9c5be394da4f20bcfea7f6d4f5919d5c0f90219 Mon Sep 17 00:00:00 2001
-From: Jeff Layton <jlay...@samba.org>
-Date: Thu, 17 Nov 2016 13:13:57 -0500
-Subject: [PATCH 1/2] VFS: convert to using ceph_statx structures and
- functions, when available
-
-Add a configure test for the ceph_statx function, and use that to
-determine whether to compile in new functions that use it and its
-variants, or whether to use a the older code that fetches birthtimes
-from an xattr.
-
-For cephwrap_lstat, we can use ceph_statx with the AT_SYMLINK_NOFOLLOW
-flag to get the right lookup semantics.
-
-For setting the times via cephwrap_ntimes, We can just use ceph_setattrx
-and pass them all in at the same time.
-
-Signed-off-by: Jeff Layton <jlay...@redhat.com>
-Reviewed-by: Jeremy Allison <j...@samba.org>
----
- source3/modules/vfs_ceph.c | 209 ++++++++++++++++++++++++++++++++++++++-------
- source3/wscript | 2 +
- 2 files changed, 178 insertions(+), 33 deletions(-)
-
-diff --git source3/modules/vfs_ceph.c source3/modules/vfs_ceph.c
-index 8e02683..bca942d 100644
---- source3/modules/vfs_ceph.c
-+++ source3/modules/vfs_ceph.c
-@@ -535,6 +535,148 @@ static int cephwrap_fsync(struct vfs_handle_struct
*handle, files_struct *fsp)
- WRAP_RETURN(result);
- }
-
-+#ifdef HAVE_CEPH_STATX
-+#define SAMBA_STATX_ATTR_MASK (CEPH_STATX_BASIC_STATS|CEPH_STATX_BTIME)
-+
-+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_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;
-+ dst->st_ex_ino = stx->stx_ino;
-+ dst->st_ex_mode = stx->stx_mode;
-+ dst->st_ex_uid = stx->stx_uid;
-+ dst->st_ex_gid = stx->stx_gid;
-+ dst->st_ex_size = stx->stx_size;
-+ dst->st_ex_nlink = stx->stx_nlink;
-+ dst->st_ex_atime = stx->stx_atime;
-+ dst->st_ex_btime = stx->stx_btime;
-+ dst->st_ex_ctime = stx->stx_ctime;
-+ dst->st_ex_mtime = stx->stx_mtime;
-+ dst->st_ex_calculated_birthtime = false;
-+ dst->st_ex_blksize = stx->stx_blksize;
-+ dst->st_ex_blocks = stx->stx_blocks;
-+}
-+
-+static int cephwrap_stat(struct vfs_handle_struct *handle,
-+ struct smb_filename *smb_fname)
-+{
-+ int result = -1;
-+ struct ceph_statx stx;
-+
-+ DEBUG(10, ("[CEPH] stat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname)));
-+
-+ if (smb_fname->stream_name) {
-+ errno = ENOENT;
-+ return result;
-+ }
-+
-+ result = ceph_statx(handle->data, smb_fname->base_name, &stx,
-+ SAMBA_STATX_ATTR_MASK, 0);
-+ DEBUG(10, ("[CEPH] statx(...) = %d\n", result));
-+ if (result < 0) {
-+ WRAP_RETURN(result);
-+ } else {
-+ DEBUG(10, ("[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)));
-+ }
-+ init_stat_ex_from_ceph_statx(&smb_fname->st, &stx);
-+ DEBUG(10, ("[CEPH] mode = 0x%x\n", smb_fname->st.st_ex_mode));
-+ return result;
-+}
-+
-+static int cephwrap_fstat(struct vfs_handle_struct *handle, files_struct
*fsp, SMB_STRUCT_STAT *sbuf)
-+{
-+ int result = -1;
-+ struct ceph_statx stx;
-+
-+ DEBUG(10, ("[CEPH] fstat(%p, %d)\n", handle, fsp->fh->fd));
-+ result = ceph_fstatx(handle->data, fsp->fh->fd, &stx,
-+ SAMBA_STATX_ATTR_MASK, 0);
-+ DEBUG(10, ("[CEPH] fstat(...) = %d\n", result));
-+ if (result < 0) {
-+ WRAP_RETURN(result);
-+ } else {
-+ DEBUG(10, ("[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)));
-+ }
-+ init_stat_ex_from_ceph_statx(sbuf, &stx);
-+ DEBUG(10, ("[CEPH] mode = 0x%x\n", sbuf->st_ex_mode));
-+ return result;
-+}
-+
-+static int cephwrap_lstat(struct vfs_handle_struct *handle,
-+ struct smb_filename *smb_fname)
-+{
-+ int result = -1;
-+ struct ceph_statx stx;
-+
-+ DEBUG(10, ("[CEPH] lstat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname)));
-+
-+ if (smb_fname->stream_name) {
-+ errno = ENOENT;
-+ return result;
-+ }
-+
-+ result = ceph_statx(handle->data, smb_fname->base_name, &stx,
-+ SAMBA_STATX_ATTR_MASK, AT_SYMLINK_NOFOLLOW);
-+ DEBUG(10, ("[CEPH] lstat(...) = %d\n", result));
-+ if (result < 0) {
-+ WRAP_RETURN(result);
-+ }
-+ init_stat_ex_from_ceph_statx(&smb_fname->st, &stx);
-+ return result;
-+}
-+
-+static int cephwrap_ntimes(struct vfs_handle_struct *handle,
-+ const struct smb_filename *smb_fname,
-+ struct smb_file_time *ft)
-+{
-+ struct ceph_statx stx = { 0 };
-+ int result;
-+ int mask = 0;
-+
-+ if (!null_timespec(ft->atime)) {
-+ stx.stx_atime = ft->atime;
-+ mask |= CEPH_SETATTR_ATIME;
-+ }
-+ if (!null_timespec(ft->mtime)) {
-+ stx.stx_mtime = ft->mtime;
-+ mask |= CEPH_SETATTR_MTIME;
-+ }
-+ if (!null_timespec(ft->create_time)) {
-+ stx.stx_btime = ft->create_time;
-+ mask |= CEPH_SETATTR_BTIME;
-+ }
-+
-+ if (!mask) {
-+ return 0;
-+ }
-+
-+ result = ceph_setattrx(handle->data, smb_fname->base_name, &stx, mask,
0);
-+ DEBUG(10, ("[CEPH] ntimes(%p, %s, {%ld, %ld, %ld, %ld}) = %d\n",
handle, smb_fname_str_dbg(smb_fname),
-+ ft->mtime.tv_sec, ft->atime.tv_sec,
ft->ctime.tv_sec,
-+ ft->create_time.tv_sec, result));
-+ return result;
-+}
-+
-+#else /* HAVE_CEPH_STATX */
-+
- static int cephwrap_stat(struct vfs_handle_struct *handle,
- struct smb_filename *smb_fname)
- {
-@@ -617,6 +759,40 @@ static int cephwrap_lstat(struct vfs_handle_struct
*handle,
- return result;
- }
-
-+static int cephwrap_ntimes(struct vfs_handle_struct *handle,
-+ const struct smb_filename *smb_fname,
-+ struct smb_file_time *ft)
-+{
-+ struct utimbuf buf;
-+ int result;
-+
-+ if (null_timespec(ft->atime)) {
-+ buf.actime = smb_fname->st.st_ex_atime.tv_sec;
-+ } else {
-+ buf.actime = ft->atime.tv_sec;
-+ }
-+ if (null_timespec(ft->mtime)) {
-+ buf.modtime = smb_fname->st.st_ex_mtime.tv_sec;
-+ } else {
-+ buf.modtime = ft->mtime.tv_sec;
-+ }
-+ if (!null_timespec(ft->create_time)) {
-+ set_create_timespec_ea(handle->conn, smb_fname,
-+ ft->create_time);
-+ }
-+ if (buf.actime == smb_fname->st.st_ex_atime.tv_sec &&
-+ buf.modtime == smb_fname->st.st_ex_mtime.tv_sec) {
-+ return 0;
-+ }
-+
-+ result = ceph_utime(handle->data, smb_fname->base_name, &buf);
-+ DEBUG(10, ("[CEPH] ntimes(%p, %s, {%ld, %ld, %ld, %ld}) = %d\n",
handle, smb_fname_str_dbg(smb_fname),
-+ ft->mtime.tv_sec, ft->atime.tv_sec,
ft->ctime.tv_sec,
-+ ft->create_time.tv_sec, result));
-+ return result;
-+}
-+#endif /* HAVE_CEPH_STATX */
-+
- static int cephwrap_unlink(struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname)
- {
-@@ -769,39 +945,6 @@ static char *cephwrap_getwd(struct vfs_handle_struct
*handle)
- return SMB_STRDUP(cwd);
- }
-
--static int cephwrap_ntimes(struct vfs_handle_struct *handle,
-- const struct smb_filename *smb_fname,
-- struct smb_file_time *ft)
--{
-- struct utimbuf buf;
-- int result;
--
-- if (null_timespec(ft->atime)) {
-- buf.actime = smb_fname->st.st_ex_atime.tv_sec;
-- } else {
-- buf.actime = ft->atime.tv_sec;
-- }
-- if (null_timespec(ft->mtime)) {
-- buf.modtime = smb_fname->st.st_ex_mtime.tv_sec;
-- } else {
-- buf.modtime = ft->mtime.tv_sec;
-- }
-- if (!null_timespec(ft->create_time)) {
-- set_create_timespec_ea(handle->conn, smb_fname,
-- ft->create_time);
-- }
-- if (buf.actime == smb_fname->st.st_ex_atime.tv_sec &&
-- buf.modtime == smb_fname->st.st_ex_mtime.tv_sec) {
-- return 0;
-- }
--
-- result = ceph_utime(handle->data, smb_fname->base_name, &buf);
-- DEBUG(10, ("[CEPH] ntimes(%p, %s, {%ld, %ld, %ld, %ld}) = %d\n",
handle, smb_fname_str_dbg(smb_fname),
-- ft->mtime.tv_sec, ft->atime.tv_sec,
ft->ctime.tv_sec,
-- ft->create_time.tv_sec, result));
-- return result;
--}
--
- static int strict_allocate_ftruncate(struct vfs_handle_struct *handle,
files_struct *fsp, off_t len)
- {
- off_t space_to_write;
-diff --git source3/wscript source3/wscript
-index 5ce1b77..c6b2421 100644
---- source3/wscript
-+++ source3/wscript
-@@ -1582,6 +1582,8 @@ main() {
- if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
conf.CHECK_LIB('cephfs', shlib=True) and Options.options.with_cephfs:
- if Options.options.with_acl_support:
- conf.DEFINE('HAVE_CEPH', '1')
-+ if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs',
headers='cephfs/libcephfs.h'):
-+ conf.DEFINE('HAVE_CEPH_STATX', '1')
- else:
- Logs.warn("ceph support disabled due to --without-acl-support")
- conf.undefine('HAVE_CEPH')
---
-2.10.2
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/samba.org/0002-vfs-ceph-convert-to-new-DBG_-macros.patch
new/patches/samba.org/0002-vfs-ceph-convert-to-new-DBG_-macros.patch
--- old/patches/samba.org/0002-vfs-ceph-convert-to-new-DBG_-macros.patch
2017-01-25 17:57:06.000000000 +0100
+++ new/patches/samba.org/0002-vfs-ceph-convert-to-new-DBG_-macros.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,890 +0,0 @@
-From 2b8001475bc87e4e0e2057dc31cf34f4d61331c7 Mon Sep 17 00:00:00 2001
-From: Jeff Layton <jlay...@samba.org>
-Date: Fri, 18 Nov 2016 07:31:21 -0500
-Subject: [PATCH 2/2] vfs: ceph: convert to new DBG_* macros
-
-...per Jeremy's recommendation.
-
-Signed-off-by: Jeff Layton <jlay...@redhat.com>
-Reviewed-by: Jeremy Allison <j...@samba.org>
-
-Autobuild-User(master): Jeremy Allison <j...@samba.org>
-Autobuild-Date(master): Mon Nov 21 03:34:26 CET 2016 on sn-devel-144
----
- source3/modules/vfs_ceph.c | 254 ++++++++++++++++++++++-----------------------
- 1 file changed, 122 insertions(+), 132 deletions(-)
-
-diff --git source3/modules/vfs_ceph.c source3/modules/vfs_ceph.c
-index bca942d..75233ef 100644
---- source3/modules/vfs_ceph.c
-+++ source3/modules/vfs_ceph.c
-@@ -96,30 +96,30 @@ static int cephwrap_connect(struct vfs_handle_struct
*handle, const char *servi
-
- conf_file = lp_parm_const_string(SNUM(handle->conn), "ceph",
"config_file", NULL);
-
-- DEBUG(2, ( "[CEPH] calling: ceph_create\n" ));
-+ DBG_DEBUG( "[CEPH] calling: ceph_create\n" );
- ret = ceph_create(&cmount, NULL);
- if (ret)
- goto err_out;
-
- if (conf_file) {
- /* Override the config file */
-- DEBUG(2, ( "[CEPH] calling: ceph_conf_read_file\n" ));
-+ DBG_DEBUG( "[CEPH] calling: ceph_conf_read_file\n" );
- ret = ceph_conf_read_file(cmount, conf_file);
- } else {
-
-- DEBUG(2, ( "[CEPH] calling: ceph_conf_read_file with %s\n",
conf_file));
-+ DBG_DEBUG( "[CEPH] calling: ceph_conf_read_file with %s\n",
conf_file);
- ret = ceph_conf_read_file(cmount, NULL);
- }
-
- if (ret)
- goto err_out;
-
-- DEBUG(2, ( "[CEPH] calling: ceph_conf_get\n" ));
-+ DBG_DEBUG( "[CEPH] calling: ceph_conf_get\n" );
- ret = ceph_conf_get(cmount, "log file", buf, sizeof(buf));
- if (ret < 0)
- goto err_out;
-
-- DEBUG(2, ("[CEPH] calling: ceph_mount\n"));
-+ DBG_DEBUG("[CEPH] calling: ceph_mount\n");
- ret = ceph_mount(cmount, NULL);
- if (ret < 0)
- goto err_out;
-@@ -138,20 +138,20 @@ err_out:
- /*
- * Handle the error correctly. Ceph returns -errno.
- */
-- DEBUG(2, ("[CEPH] Error return: %s\n", strerror(-ret)));
-+ DBG_DEBUG("[CEPH] Error return: %s\n", strerror(-ret));
- WRAP_RETURN(ret);
- }
-
- static void cephwrap_disconnect(struct vfs_handle_struct *handle)
- {
- if (!cmount) {
-- DEBUG(0, ("[CEPH] Error, ceph not mounted\n"));
-+ DBG_ERR("[CEPH] Error, ceph not mounted\n");
- return;
- }
-
- /* Should we unmount/shutdown? Only if the last disconnect? */
- if (--cmount_cnt) {
-- DEBUG(10, ("[CEPH] Not shuting down CEPH because still more
connections\n"));
-+ DBG_DEBUG("[CEPH] Not shuting down CEPH because still more
connections\n");
- return;
- }
-
-@@ -176,11 +176,11 @@ static uint64_t cephwrap_disk_free(struct
vfs_handle_struct *handle,
- *bsize = statvfs_buf.f_bsize;
- *dfree = statvfs_buf.f_bavail;
- *dsize = statvfs_buf.f_blocks;
-- DEBUG(10, ("[CEPH] bsize: %llu, dfree: %llu, dsize: %llu\n",
-- llu(*bsize), llu(*dfree), llu(*dsize)));
-+ DBG_DEBUG("[CEPH] bsize: %llu, dfree: %llu, dsize: %llu\n",
-+ llu(*bsize), llu(*dfree), llu(*dsize));
- return *dfree;
- } else {
-- DEBUG(10, ("[CEPH] ceph_statfs returned %d\n", ret));
-+ DBG_DEBUG("[CEPH] ceph_statfs returned %d\n", ret);
- WRAP_RETURN(ret);
- }
- }
-@@ -244,9 +244,9 @@ static int cephwrap_statvfs(struct vfs_handle_struct
*handle, const char *path,
- statbuf->TotalFileNodes = statvfs_buf.f_files;
- statbuf->FreeFileNodes = statvfs_buf.f_ffree;
- statbuf->FsIdentifier = statvfs_buf.f_fsid;
-- DEBUG(10, ("[CEPH] f_bsize: %ld, f_blocks: %ld, f_bfree: %ld,
f_bavail: %ld\n",
-+ 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));
-+ (long int)statvfs_buf.f_bfree, (long
int)statvfs_buf.f_bavail);
- }
- return ret;
- }
-@@ -259,7 +259,7 @@ static DIR *cephwrap_opendir(struct vfs_handle_struct
*handle,
- {
- int ret = 0;
- struct ceph_dir_result *result;
-- DEBUG(10, ("[CEPH] opendir(%p, %s)\n", handle, smb_fname->base_name));
-+ DBG_DEBUG("[CEPH] opendir(%p, %s)\n", handle, smb_fname->base_name);
-
- /* Returns NULL if it does not exist or there are problems ? */
- ret = ceph_opendir(handle->data, smb_fname->base_name, &result);
-@@ -268,7 +268,7 @@ static DIR *cephwrap_opendir(struct vfs_handle_struct
*handle,
- errno = -ret; /* We return result which is NULL in this case */
- }
-
-- DEBUG(10, ("[CEPH] opendir(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] opendir(...) = %d\n", ret);
- return (DIR *) result;
- }
-
-@@ -279,7 +279,7 @@ static DIR *cephwrap_fdopendir(struct vfs_handle_struct
*handle,
- {
- int ret = 0;
- struct ceph_dir_result *result;
-- DEBUG(10, ("[CEPH] fdopendir(%p, %p)\n", handle, fsp));
-+ DBG_DEBUG("[CEPH] fdopendir(%p, %p)\n", handle, fsp);
-
- ret = ceph_opendir(handle->data, fsp->fsp_name->base_name, &result);
- if (ret < 0) {
-@@ -287,7 +287,7 @@ static DIR *cephwrap_fdopendir(struct vfs_handle_struct
*handle,
- errno = -ret; /* We return result which is NULL in this case */
- }
-
-- DEBUG(10, ("[CEPH] fdopendir(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] fdopendir(...) = %d\n", ret);
- return (DIR *) result;
- }
-
-@@ -297,9 +297,9 @@ static struct dirent *cephwrap_readdir(struct
vfs_handle_struct *handle,
- {
- struct dirent *result;
-
-- DEBUG(10, ("[CEPH] readdir(%p, %p)\n", handle, dirp));
-+ DBG_DEBUG("[CEPH] readdir(%p, %p)\n", handle, dirp);
- result = ceph_readdir(handle->data, (struct ceph_dir_result *) dirp);
-- DEBUG(10, ("[CEPH] readdir(...) = %p\n", result));
-+ DBG_DEBUG("[CEPH] readdir(...) = %p\n", result);
-
- /* Default Posix readdir() does not give us stat info.
- * Set to invalid to indicate we didn't return this info. */
-@@ -310,22 +310,22 @@ static struct dirent *cephwrap_readdir(struct
vfs_handle_struct *handle,
-
- static void cephwrap_seekdir(struct vfs_handle_struct *handle, DIR *dirp,
long offset)
- {
-- DEBUG(10, ("[CEPH] seekdir(%p, %p, %ld)\n", handle, dirp, offset));
-+ DBG_DEBUG("[CEPH] seekdir(%p, %p, %ld)\n", handle, dirp, offset);
- ceph_seekdir(handle->data, (struct ceph_dir_result *) dirp, offset);
- }
-
- static long cephwrap_telldir(struct vfs_handle_struct *handle, DIR *dirp)
- {
- long ret;
-- DEBUG(10, ("[CEPH] telldir(%p, %p)\n", handle, dirp));
-+ DBG_DEBUG("[CEPH] telldir(%p, %p)\n", handle, dirp);
- ret = ceph_telldir(handle->data, (struct ceph_dir_result *) dirp);
-- DEBUG(10, ("[CEPH] telldir(...) = %ld\n", ret));
-+ DBG_DEBUG("[CEPH] telldir(...) = %ld\n", ret);
- WRAP_RETURN(ret);
- }
-
- static void cephwrap_rewinddir(struct vfs_handle_struct *handle, DIR *dirp)
- {
-- DEBUG(10, ("[CEPH] rewinddir(%p, %p)\n", handle, dirp));
-+ DBG_DEBUG("[CEPH] rewinddir(%p, %p)\n", handle, dirp);
- ceph_rewinddir(handle->data, (struct ceph_dir_result *) dirp);
- }
-
-@@ -338,7 +338,7 @@ static int cephwrap_mkdir(struct vfs_handle_struct *handle,
- char *parent = NULL;
- const char *path = smb_fname->base_name;
-
-- DEBUG(10, ("[CEPH] mkdir(%p, %s)\n", handle, path));
-+ DBG_DEBUG("[CEPH] mkdir(%p, %s)\n", handle, path);
-
- if (lp_inherit_acls(SNUM(handle->conn))
- && parent_dirname(talloc_tos(), path, &parent, NULL)
-@@ -377,9 +377,9 @@ static int cephwrap_rmdir(struct vfs_handle_struct *handle,
- {
- int result;
-
-- DEBUG(10, ("[CEPH] rmdir(%p, %s)\n", handle, smb_fname->base_name));
-+ DBG_DEBUG("[CEPH] rmdir(%p, %s)\n", handle, smb_fname->base_name);
- result = ceph_rmdir(handle->data, smb_fname->base_name);
-- DEBUG(10, ("[CEPH] rmdir(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] rmdir(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
-@@ -387,9 +387,9 @@ static int cephwrap_closedir(struct vfs_handle_struct
*handle, DIR *dirp)
- {
- int result;
-
-- DEBUG(10, ("[CEPH] closedir(%p, %p)\n", handle, dirp));
-+ DBG_DEBUG("[CEPH] closedir(%p, %p)\n", handle, dirp);
- result = ceph_closedir(handle->data, (struct ceph_dir_result *) dirp);
-- DEBUG(10, ("[CEPH] closedir(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] closedir(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
-@@ -400,7 +400,8 @@ static int cephwrap_open(struct vfs_handle_struct *handle,
- files_struct *fsp, int flags, mode_t mode)
- {
- int result = -ENOENT;
-- DEBUG(10, ("[CEPH] open(%p, %s, %p, %d, %d)\n", handle,
smb_fname_str_dbg(smb_fname), fsp, flags, mode));
-+ DBG_DEBUG("[CEPH] open(%p, %s, %p, %d, %d)\n", handle,
-+ smb_fname_str_dbg(smb_fname), fsp, flags, mode);
-
- if (smb_fname->stream_name) {
- goto out;
-@@ -408,7 +409,7 @@ static int cephwrap_open(struct vfs_handle_struct *handle,
-
- result = ceph_open(handle->data, smb_fname->base_name, flags, mode);
- out:
-- DEBUG(10, ("[CEPH] open(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] open(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
-@@ -416,9 +417,9 @@ static int cephwrap_close(struct vfs_handle_struct
*handle, files_struct *fsp)
- {
- int result;
-
-- DEBUG(10, ("[CEPH] close(%p, %p)\n", handle, fsp));
-+ DBG_DEBUG("[CEPH] close(%p, %p)\n", handle, fsp);
- result = ceph_close(handle->data, fsp->fh->fd);
-- DEBUG(10, ("[CEPH] close(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] close(...) = %d\n", result);
-
- WRAP_RETURN(result);
- }
-@@ -427,11 +428,11 @@ static ssize_t cephwrap_read(struct vfs_handle_struct
*handle, files_struct *fsp
- {
- ssize_t result;
-
-- DEBUG(10, ("[CEPH] read(%p, %p, %p, %llu)\n", handle, fsp, data,
llu(n)));
-+ DBG_DEBUG("[CEPH] read(%p, %p, %p, %llu)\n", handle, fsp, data, llu(n));
-
- /* Using -1 for the offset means read/write rather than pread/pwrite */
- result = ceph_read(handle->data, fsp->fh->fd, data, n, -1);
-- DEBUG(10, ("[CEPH] read(...) = %llu\n", llu(result)));
-+ DBG_DEBUG("[CEPH] read(...) = %llu\n", llu(result));
- WRAP_RETURN(result);
- }
-
-@@ -440,10 +441,10 @@ static ssize_t cephwrap_pread(struct vfs_handle_struct
*handle, files_struct *fs
- {
- ssize_t result;
-
-- DEBUG(10, ("[CEPH] pread(%p, %p, %p, %llu, %llu)\n", handle, fsp, data,
llu(n), llu(offset)));
-+ DBG_DEBUG("[CEPH] pread(%p, %p, %p, %llu, %llu)\n", handle, fsp, data,
llu(n), llu(offset));
-
- result = ceph_read(handle->data, fsp->fh->fd, data, n, offset);
-- DEBUG(10, ("[CEPH] pread(...) = %llu\n", llu(result)));
-+ DBG_DEBUG("[CEPH] pread(...) = %llu\n", llu(result));
- WRAP_RETURN(result);
- }
-
-@@ -452,11 +453,11 @@ static ssize_t cephwrap_write(struct vfs_handle_struct
*handle, files_struct *fs
- {
- ssize_t result;
-
-- DEBUG(10, ("[CEPH] write(%p, %p, %p, %llu)\n", handle, fsp, data,
llu(n)));
-+ DBG_DEBUG("[CEPH] write(%p, %p, %p, %llu)\n", handle, fsp, data,
llu(n));
-
- result = ceph_write(handle->data, fsp->fh->fd, data, n, -1);
-
-- DEBUG(10, ("[CEPH] write(...) = %llu\n", llu(result)));
-+ DBG_DEBUG("[CEPH] write(...) = %llu\n", llu(result));
- if (result < 0) {
- WRAP_RETURN(result);
- }
-@@ -469,9 +470,9 @@ static ssize_t cephwrap_pwrite(struct vfs_handle_struct
*handle, files_struct *f
- {
- ssize_t result;
-
-- DEBUG(10, ("[CEPH] pwrite(%p, %p, %p, %llu, %llu)\n", handle, fsp,
data, llu(n), llu(offset)));
-+ DBG_DEBUG("[CEPH] pwrite(%p, %p, %p, %llu, %llu)\n", handle, fsp, data,
llu(n), llu(offset));
- result = ceph_write(handle->data, fsp->fh->fd, data, n, offset);
-- DEBUG(10, ("[CEPH] pwrite(...) = %llu\n", llu(result)));
-+ DBG_DEBUG("[CEPH] pwrite(...) = %llu\n", llu(result));
- WRAP_RETURN(result);
- }
-
-@@ -479,7 +480,7 @@ static off_t cephwrap_lseek(struct vfs_handle_struct
*handle, files_struct *fsp,
- {
- off_t result = 0;
-
-- DEBUG(10, ("[CEPH] cephwrap_lseek\n"));
-+ DBG_DEBUG("[CEPH] cephwrap_lseek\n");
- /* Cope with 'stat' file opens. */
- if (fsp->fh->fd != -1) {
- result = ceph_lseek(handle->data, fsp->fh->fd, offset, whence);
-@@ -493,7 +494,7 @@ static ssize_t cephwrap_sendfile(struct vfs_handle_struct
*handle, int tofd, fil
- /*
- * We cannot support sendfile because libceph is in user space.
- */
-- DEBUG(10, ("[CEPH] cephwrap_sendfile\n"));
-+ DBG_DEBUG("[CEPH] cephwrap_sendfile\n");
- errno = ENOTSUP;
- return -1;
- }
-@@ -507,7 +508,7 @@ static ssize_t cephwrap_recvfile(struct vfs_handle_struct
*handle,
- /*
- * We cannot support recvfile because libceph is in user space.
- */
-- DEBUG(10, ("[CEPH] cephwrap_recvfile\n"));
-+ DBG_DEBUG("[CEPH] cephwrap_recvfile\n");
- errno=ENOTSUP;
- return -1;
- }
-@@ -517,7 +518,7 @@ static int cephwrap_rename(struct vfs_handle_struct
*handle,
- const struct smb_filename *smb_fname_dst)
- {
- int result = -1;
-- DEBUG(10, ("[CEPH] cephwrap_rename\n"));
-+ DBG_DEBUG("[CEPH] cephwrap_rename\n");
- if (smb_fname_src->stream_name || smb_fname_dst->stream_name) {
- errno = ENOENT;
- return result;
-@@ -530,7 +531,7 @@ static int cephwrap_rename(struct vfs_handle_struct
*handle,
- static int cephwrap_fsync(struct vfs_handle_struct *handle, files_struct *fsp)
- {
- int result;
-- DEBUG(10, ("[CEPH] cephwrap_fsync\n"));
-+ DBG_DEBUG("[CEPH] cephwrap_fsync\n");
- result = ceph_fsync(handle->data, fsp->fh->fd, false);
- WRAP_RETURN(result);
- }
-@@ -567,7 +568,7 @@ static int cephwrap_stat(struct vfs_handle_struct *handle,
- int result = -1;
- struct ceph_statx stx;
-
-- DEBUG(10, ("[CEPH] stat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname)));
-+ DBG_DEBUG("[CEPH] stat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname));
-
- if (smb_fname->stream_name) {
- errno = ENOENT;
-@@ -576,21 +577,21 @@ static int cephwrap_stat(struct vfs_handle_struct
*handle,
-
- result = ceph_statx(handle->data, smb_fname->base_name, &stx,
- SAMBA_STATX_ATTR_MASK, 0);
-- DEBUG(10, ("[CEPH] statx(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] statx(...) = %d\n", result);
- if (result < 0) {
- WRAP_RETURN(result);
- } else {
-- DEBUG(10, ("[CEPH]\tstx = {dev = %llx, ino = %llu, mode = 0x%x,
nlink = %llu, "
-+ 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)));
-+ llu(stx.stx_ctime.tv_sec),
llu(stx.stx_btime.tv_sec));
- }
- init_stat_ex_from_ceph_statx(&smb_fname->st, &stx);
-- DEBUG(10, ("[CEPH] mode = 0x%x\n", smb_fname->st.st_ex_mode));
-+ DBG_DEBUG("[CEPH] mode = 0x%x\n", smb_fname->st.st_ex_mode);
- return result;
- }
-
-@@ -599,24 +600,24 @@ static int cephwrap_fstat(struct vfs_handle_struct
*handle, files_struct *fsp, S
- int result = -1;
- struct ceph_statx stx;
-
-- DEBUG(10, ("[CEPH] fstat(%p, %d)\n", handle, fsp->fh->fd));
-+ DBG_DEBUG("[CEPH] fstat(%p, %d)\n", handle, fsp->fh->fd);
- result = ceph_fstatx(handle->data, fsp->fh->fd, &stx,
- SAMBA_STATX_ATTR_MASK, 0);
-- DEBUG(10, ("[CEPH] fstat(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] fstat(...) = %d\n", result);
- if (result < 0) {
- WRAP_RETURN(result);
- } else {
-- DEBUG(10, ("[CEPH]\tstx = {dev = %llx, ino = %llu, mode = 0x%x,
nlink = %llu, "
-+ 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)));
-+ llu(stx.stx_ctime.tv_sec),
llu(stx.stx_btime.tv_sec));
- }
- init_stat_ex_from_ceph_statx(sbuf, &stx);
-- DEBUG(10, ("[CEPH] mode = 0x%x\n", sbuf->st_ex_mode));
-+ DBG_DEBUG("[CEPH] mode = 0x%x\n", sbuf->st_ex_mode);
- return result;
- }
-
-@@ -626,7 +627,7 @@ static int cephwrap_lstat(struct vfs_handle_struct *handle,
- int result = -1;
- struct ceph_statx stx;
-
-- DEBUG(10, ("[CEPH] lstat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname)));
-+ DBG_DEBUG("[CEPH] lstat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname));
-
- if (smb_fname->stream_name) {
- errno = ENOENT;
-@@ -635,7 +636,7 @@ static int cephwrap_lstat(struct vfs_handle_struct *handle,
-
- result = ceph_statx(handle->data, smb_fname->base_name, &stx,
- SAMBA_STATX_ATTR_MASK, AT_SYMLINK_NOFOLLOW);
-- DEBUG(10, ("[CEPH] lstat(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] lstat(...) = %d\n", result);
- if (result < 0) {
- WRAP_RETURN(result);
- }
-@@ -669,9 +670,9 @@ static int cephwrap_ntimes(struct vfs_handle_struct
*handle,
- }
-
- result = ceph_setattrx(handle->data, smb_fname->base_name, &stx, mask,
0);
-- DEBUG(10, ("[CEPH] ntimes(%p, %s, {%ld, %ld, %ld, %ld}) = %d\n",
handle, smb_fname_str_dbg(smb_fname),
-+ DBG_DEBUG("[CEPH] ntimes(%p, %s, {%ld, %ld, %ld, %ld}) = %d\n", handle,
smb_fname_str_dbg(smb_fname),
- ft->mtime.tv_sec, ft->atime.tv_sec,
ft->ctime.tv_sec,
-- ft->create_time.tv_sec, result));
-+ ft->create_time.tv_sec, result);
- return result;
- }
-
-@@ -683,7 +684,7 @@ static int cephwrap_stat(struct vfs_handle_struct *handle,
- int result = -1;
- struct stat stbuf;
-
-- DEBUG(10, ("[CEPH] stat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname)));
-+ DBG_DEBUG("[CEPH] stat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname));
-
- if (smb_fname->stream_name) {
- errno = ENOENT;
-@@ -691,21 +692,21 @@ static int cephwrap_stat(struct vfs_handle_struct
*handle,
- }
-
- result = ceph_stat(handle->data, smb_fname->base_name, (struct stat *)
&stbuf);
-- DEBUG(10, ("[CEPH] stat(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] stat(...) = %d\n", result);
- if (result < 0) {
- WRAP_RETURN(result);
- } else {
-- DEBUG(10, ("[CEPH]\tstbuf = {dev = %llu, ino = %llu, mode =
0x%x, nlink = %llu, "
-+ DBG_DEBUG("[CEPH]\tstbuf = {dev = %llu, ino = %llu, mode =
0x%x, nlink = %llu, "
- "uid = %d, gid = %d, rdev = %llu, size = %llu,
blksize = %llu, "
- "blocks = %llu, atime = %llu, mtime = %llu, ctime =
%llu}\n",
- llu(stbuf.st_dev), llu(stbuf.st_ino), stbuf.st_mode,
llu(stbuf.st_nlink),
- stbuf.st_uid, stbuf.st_gid, llu(stbuf.st_rdev),
llu(stbuf.st_size), llu(stbuf.st_blksize),
-- llu(stbuf.st_blocks), llu(stbuf.st_atime),
llu(stbuf.st_mtime), llu(stbuf.st_ctime)));
-+ llu(stbuf.st_blocks), llu(stbuf.st_atime),
llu(stbuf.st_mtime), llu(stbuf.st_ctime));
- }
- init_stat_ex_from_stat(
- &smb_fname->st, &stbuf,
- lp_fake_directory_create_times(SNUM(handle->conn)));
-- DEBUG(10, ("[CEPH] mode = 0x%x\n", smb_fname->st.st_ex_mode));
-+ DBG_DEBUG("[CEPH] mode = 0x%x\n", smb_fname->st.st_ex_mode);
- return result;
- }
-
-@@ -714,24 +715,24 @@ static int cephwrap_fstat(struct vfs_handle_struct
*handle, files_struct *fsp, S
- int result = -1;
- struct stat stbuf;
-
-- DEBUG(10, ("[CEPH] fstat(%p, %d)\n", handle, fsp->fh->fd));
-+ DBG_DEBUG("[CEPH] fstat(%p, %d)\n", handle, fsp->fh->fd);
- result = ceph_fstat(handle->data, fsp->fh->fd, (struct stat *) &stbuf);
-- DEBUG(10, ("[CEPH] fstat(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] fstat(...) = %d\n", result);
- if (result < 0) {
- WRAP_RETURN(result);
- } else {
-- DEBUG(10, ("[CEPH]\tstbuf = {dev = %llu, ino = %llu, mode =
0x%x, nlink = %llu, "
-+ DBG_DEBUG("[CEPH]\tstbuf = {dev = %llu, ino = %llu, mode =
0x%x, nlink = %llu, "
- "uid = %d, gid = %d, rdev = %llu, size = %llu,
blksize = %llu, "
- "blocks = %llu, atime = %llu, mtime = %llu, ctime =
%llu}\n",
- llu(stbuf.st_dev), llu(stbuf.st_ino), stbuf.st_mode,
llu(stbuf.st_nlink),
- stbuf.st_uid, stbuf.st_gid, llu(stbuf.st_rdev),
llu(stbuf.st_size), llu(stbuf.st_blksize),
-- llu(stbuf.st_blocks), llu(stbuf.st_atime),
llu(stbuf.st_mtime), llu(stbuf.st_ctime)));
-+ llu(stbuf.st_blocks), llu(stbuf.st_atime),
llu(stbuf.st_mtime), llu(stbuf.st_ctime));
- }
-
- init_stat_ex_from_stat(
- sbuf, &stbuf,
- lp_fake_directory_create_times(SNUM(handle->conn)));
-- DEBUG(10, ("[CEPH] mode = 0x%x\n", sbuf->st_ex_mode));
-+ DBG_DEBUG("[CEPH] mode = 0x%x\n", sbuf->st_ex_mode);
- return result;
- }
-
-@@ -741,7 +742,7 @@ static int cephwrap_lstat(struct vfs_handle_struct *handle,
- int result = -1;
- struct stat stbuf;
-
-- DEBUG(10, ("[CEPH] lstat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname)));
-+ DBG_DEBUG("[CEPH] lstat(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname));
-
- if (smb_fname->stream_name) {
- errno = ENOENT;
-@@ -749,7 +750,7 @@ static int cephwrap_lstat(struct vfs_handle_struct *handle,
- }
-
- result = ceph_lstat(handle->data, smb_fname->base_name, &stbuf);
-- DEBUG(10, ("[CEPH] lstat(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] lstat(...) = %d\n", result);
- if (result < 0) {
- WRAP_RETURN(result);
- }
-@@ -786,9 +787,9 @@ static int cephwrap_ntimes(struct vfs_handle_struct
*handle,
- }
-
- result = ceph_utime(handle->data, smb_fname->base_name, &buf);
-- DEBUG(10, ("[CEPH] ntimes(%p, %s, {%ld, %ld, %ld, %ld}) = %d\n",
handle, smb_fname_str_dbg(smb_fname),
-+ DBG_DEBUG("[CEPH] ntimes(%p, %s, {%ld, %ld, %ld, %ld}) = %d\n", handle,
smb_fname_str_dbg(smb_fname),
- ft->mtime.tv_sec, ft->atime.tv_sec,
ft->ctime.tv_sec,
-- ft->create_time.tv_sec, result));
-+ ft->create_time.tv_sec, result);
- return result;
- }
- #endif /* HAVE_CEPH_STATX */
-@@ -798,13 +799,13 @@ static int cephwrap_unlink(struct vfs_handle_struct
*handle,
- {
- int result = -1;
-
-- DEBUG(10, ("[CEPH] unlink(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname)));
-+ DBG_DEBUG("[CEPH] unlink(%p, %s)\n", handle,
smb_fname_str_dbg(smb_fname));
- if (smb_fname->stream_name) {
- errno = ENOENT;
- return result;
- }
- result = ceph_unlink(handle->data, smb_fname->base_name);
-- DEBUG(10, ("[CEPH] unlink(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] unlink(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
-@@ -814,10 +815,7 @@ static int cephwrap_chmod(struct vfs_handle_struct
*handle,
- {
- int result;
-
-- DEBUG(10, ("[CEPH] chmod(%p, %s, %d)\n",
-- handle,
-- smb_fname->base_name,
-- mode));
-+ DBG_DEBUG("[CEPH] chmod(%p, %s, %d)\n", handle, smb_fname->base_name,
mode);
-
- /*
- * We need to do this due to the fact that the default POSIX ACL
-@@ -839,7 +837,7 @@ static int cephwrap_chmod(struct vfs_handle_struct *handle,
- }
-
- result = ceph_chmod(handle->data, smb_fname->base_name, mode);
-- DEBUG(10, ("[CEPH] chmod(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] chmod(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
-@@ -847,7 +845,7 @@ static int cephwrap_fchmod(struct vfs_handle_struct
*handle, files_struct *fsp,
- {
- int result;
-
-- DEBUG(10, ("[CEPH] fchmod(%p, %p, %d)\n", handle, fsp, mode));
-+ DBG_DEBUG("[CEPH] fchmod(%p, %p, %d)\n", handle, fsp, mode);
-
- /*
- * We need to do this due to the fact that the default POSIX ACL
-@@ -866,7 +864,7 @@ static int cephwrap_fchmod(struct vfs_handle_struct
*handle, files_struct *fsp,
-
- #if defined(HAVE_FCHMOD)
- result = ceph_fchmod(handle->data, fsp->fh->fd, mode);
-- DEBUG(10, ("[CEPH] fchmod(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] fchmod(...) = %d\n", result);
- WRAP_RETURN(result);
- #else
- errno = ENOSYS;
-@@ -880,13 +878,9 @@ static int cephwrap_chown(struct vfs_handle_struct
*handle,
- gid_t gid)
- {
- int result;
-- DEBUG(10, ("[CEPH] chown(%p, %s, %d, %d)\n",
-- handle,
-- smb_fname->base_name,
-- uid,
-- gid));
-+ DBG_DEBUG("[CEPH] chown(%p, %s, %d, %d)\n", handle,
smb_fname->base_name, uid, gid);
- result = ceph_chown(handle->data, smb_fname->base_name, uid, gid);
-- DEBUG(10, ("[CEPH] chown(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] chown(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
-@@ -895,9 +889,9 @@ static int cephwrap_fchown(struct vfs_handle_struct
*handle, files_struct *fsp,
- int result;
- #ifdef HAVE_FCHOWN
-
-- DEBUG(10, ("[CEPH] fchown(%p, %p, %d, %d)\n", handle, fsp, uid, gid));
-+ DBG_DEBUG("[CEPH] fchown(%p, %p, %d, %d)\n", handle, fsp, uid, gid);
- result = ceph_fchown(handle->data, fsp->fh->fd, uid, gid);
-- DEBUG(10, ("[CEPH] fchown(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] fchown(...) = %d\n", result);
- WRAP_RETURN(result);
- #else
- errno = ENOSYS;
-@@ -912,20 +906,16 @@ static int cephwrap_lchown(struct vfs_handle_struct
*handle,
- gid_t gid)
- {
- int result;
-- DEBUG(10, ("[CEPH] lchown(%p, %s, %d, %d)\n",
-- handle,
-- smb_fname->base_name,
-- uid,
-- gid));
-+ DBG_DEBUG("[CEPH] lchown(%p, %s, %d, %d)\n", handle,
smb_fname->base_name, uid, gid);
- result = ceph_lchown(handle->data, smb_fname->base_name, uid, gid);
-- DEBUG(10, ("[CEPH] lchown(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] lchown(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
- static int cephwrap_chdir(struct vfs_handle_struct *handle, const char *path)
- {
- int result = -1;
-- DEBUG(10, ("[CEPH] chdir(%p, %s)\n", handle, path));
-+ DBG_DEBUG("[CEPH] chdir(%p, %s)\n", handle, path);
- /*
- * If the path is just / use chdir because Ceph is below / and
- * cannot deal with changing directory above its mount point
-@@ -934,14 +924,14 @@ static int cephwrap_chdir(struct vfs_handle_struct
*handle, const char *path)
- return chdir(path);
-
- result = ceph_chdir(handle->data, path);
-- DEBUG(10, ("[CEPH] chdir(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] chdir(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
- static char *cephwrap_getwd(struct vfs_handle_struct *handle)
- {
- const char *cwd = ceph_getcwd(handle->data);
-- DEBUG(10, ("[CEPH] getwd(%p) = %s\n", handle, cwd));
-+ DBG_DEBUG("[CEPH] getwd(%p) = %s\n", handle, cwd);
- return SMB_STRDUP(cwd);
- }
-
-@@ -1010,7 +1000,7 @@ static int cephwrap_ftruncate(struct vfs_handle_struct
*handle, files_struct *fs
- char c = 0;
- off_t currpos;
-
-- DEBUG(10, ("[CEPH] ftruncate(%p, %p, %llu\n", handle, fsp, llu(len)));
-+ DBG_DEBUG("[CEPH] ftruncate(%p, %p, %llu\n", handle, fsp, llu(len));
-
- if (lp_strict_allocate(SNUM(fsp->conn))) {
- result = strict_allocate_ftruncate(handle, fsp, len);
-@@ -1078,14 +1068,14 @@ static int cephwrap_ftruncate(struct vfs_handle_struct
*handle, files_struct *fs
-
- static bool cephwrap_lock(struct vfs_handle_struct *handle, files_struct
*fsp, int op, off_t offset, off_t count, int type)
- {
-- DEBUG(10, ("[CEPH] lock\n"));
-+ DBG_DEBUG("[CEPH] lock\n");
- return true;
- }
-
- static int cephwrap_kernel_flock(struct vfs_handle_struct *handle,
files_struct *fsp,
- uint32_t share_mode, uint32_t access_mask)
- {
-- DEBUG(10, ("[CEPH] kernel_flock\n"));
-+ DBG_DEBUG("[CEPH] kernel_flock\n");
- /*
- * We must return zero here and pretend all is good.
- * One day we might have this in CEPH.
-@@ -1095,7 +1085,7 @@ static int cephwrap_kernel_flock(struct
vfs_handle_struct *handle, files_struct
-
- static bool cephwrap_getlock(struct vfs_handle_struct *handle, files_struct
*fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
- {
-- DEBUG(10, ("[CEPH] getlock returning false and errno=0\n"));
-+ DBG_DEBUG("[CEPH] getlock returning false and errno=0\n");
-
- errno = 0;
- return false;
-@@ -1111,7 +1101,7 @@ static int cephwrap_linux_setlease(struct
vfs_handle_struct *handle, files_struc
- {
- int result = -1;
-
-- DEBUG(10, ("[CEPH] linux_setlease\n"));
-+ DBG_DEBUG("[CEPH] linux_setlease\n");
- errno = ENOSYS;
- return result;
- }
-@@ -1119,36 +1109,36 @@ static int cephwrap_linux_setlease(struct
vfs_handle_struct *handle, files_struc
- static int cephwrap_symlink(struct vfs_handle_struct *handle, const char
*oldpath, const char *newpath)
- {
- int result = -1;
-- DEBUG(10, ("[CEPH] symlink(%p, %s, %s)\n", handle, oldpath, newpath));
-+ DBG_DEBUG("[CEPH] symlink(%p, %s, %s)\n", handle, oldpath, newpath);
- result = ceph_symlink(handle->data, oldpath, newpath);
-- DEBUG(10, ("[CEPH] symlink(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] symlink(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
- static int cephwrap_readlink(struct vfs_handle_struct *handle, const char
*path, char *buf, size_t bufsiz)
- {
- int result = -1;
-- DEBUG(10, ("[CEPH] readlink(%p, %s, %p, %llu)\n", handle, path, buf,
llu(bufsiz)));
-+ DBG_DEBUG("[CEPH] readlink(%p, %s, %p, %llu)\n", handle, path, buf,
llu(bufsiz));
- result = ceph_readlink(handle->data, path, buf, bufsiz);
-- DEBUG(10, ("[CEPH] readlink(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] readlink(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
- static int cephwrap_link(struct vfs_handle_struct *handle, const char
*oldpath, const char *newpath)
- {
- int result = -1;
-- DEBUG(10, ("[CEPH] link(%p, %s, %s)\n", handle, oldpath, newpath));
-+ DBG_DEBUG("[CEPH] link(%p, %s, %s)\n", handle, oldpath, newpath);
- result = ceph_link(handle->data, oldpath, newpath);
-- DEBUG(10, ("[CEPH] link(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] link(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
- static int cephwrap_mknod(struct vfs_handle_struct *handle, const char
*pathname, mode_t mode, SMB_DEV_T dev)
- {
- int result = -1;
-- DEBUG(10, ("[CEPH] mknod(%p, %s)\n", handle, pathname));
-+ DBG_DEBUG("[CEPH] mknod(%p, %s)\n", handle, pathname);
- result = ceph_mknod(handle->data, pathname, mode, dev);
-- DEBUG(10, ("[CEPH] mknod(...) = %d\n", result));
-+ DBG_DEBUG("[CEPH] mknod(...) = %d\n", result);
- WRAP_RETURN(result);
- }
-
-@@ -1180,7 +1170,7 @@ static char *cephwrap_realpath(struct vfs_handle_struct
*handle, const char *pa
- handle->conn->connectpath, path);
- if (r < 0) return NULL;
- }
-- DEBUG(10, ("[CEPH] realpath(%p, %s) = %s\n", handle, path, result));
-+ DBG_DEBUG("[CEPH] realpath(%p, %s) = %s\n", handle, path, result);
- return result;
- }
-
-@@ -1218,9 +1208,9 @@ static const char *cephwrap_connectpath(struct
vfs_handle_struct *handle,
- static ssize_t cephwrap_getxattr(struct vfs_handle_struct *handle,const char
*path, const char *name, void *value, size_t size)
- {
- int ret;
-- DEBUG(10, ("[CEPH] getxattr(%p, %s, %s, %p, %llu)\n", handle, path,
name, value, llu(size)));
-+ DBG_DEBUG("[CEPH] getxattr(%p, %s, %s, %p, %llu)\n", handle, path,
name, value, llu(size));
- ret = ceph_getxattr(handle->data, path, name, value, size);
-- DEBUG(10, ("[CEPH] getxattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] getxattr(...) = %d\n", ret);
- if (ret < 0) {
- WRAP_RETURN(ret);
- } else {
-@@ -1231,13 +1221,13 @@ static ssize_t cephwrap_getxattr(struct
vfs_handle_struct *handle,const char *pa
- static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle, struct
files_struct *fsp, const char *name, void *value, size_t size)
- {
- int ret;
-- DEBUG(10, ("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n", handle, fsp,
name, value, llu(size)));
-+ DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n", handle, fsp,
name, value, llu(size));
- #if LIBCEPHFS_VERSION_CODE >= LIBCEPHFS_VERSION(0, 94, 0)
- ret = ceph_fgetxattr(handle->data, fsp->fh->fd, name, value, size);
- #else
- ret = ceph_getxattr(handle->data, fsp->fsp_name->base_name, name,
value, size);
- #endif
-- DEBUG(10, ("[CEPH] fgetxattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] fgetxattr(...) = %d\n", ret);
- if (ret < 0) {
- WRAP_RETURN(ret);
- } else {
-@@ -1248,9 +1238,9 @@ static ssize_t cephwrap_fgetxattr(struct
vfs_handle_struct *handle, struct files
- static ssize_t cephwrap_listxattr(struct vfs_handle_struct *handle, const
char *path, char *list, size_t size)
- {
- int ret;
-- DEBUG(10, ("[CEPH] listxattr(%p, %s, %p, %llu)\n", handle, path, list,
llu(size)));
-+ DBG_DEBUG("[CEPH] listxattr(%p, %s, %p, %llu)\n", handle, path, list,
llu(size));
- ret = ceph_listxattr(handle->data, path, list, size);
-- DEBUG(10, ("[CEPH] listxattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] listxattr(...) = %d\n", ret);
- if (ret < 0) {
- WRAP_RETURN(ret);
- } else {
-@@ -1262,9 +1252,9 @@ static ssize_t cephwrap_listxattr(struct
vfs_handle_struct *handle, const char *
- static ssize_t cephwrap_llistxattr(struct vfs_handle_struct *handle, const
char *path, char *list, size_t size)
- {
- int ret;
-- DEBUG(10, ("[CEPH] llistxattr(%p, %s, %p, %llu)\n", handle, path, list,
llu(size)));
-+ DBG_DEBUG("[CEPH] llistxattr(%p, %s, %p, %llu)\n", handle, path, list,
llu(size));
- ret = ceph_llistxattr(handle->data, path, list, size);
-- DEBUG(10, ("[CEPH] listxattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] listxattr(...) = %d\n", ret);
- if (ret < 0) {
- WRAP_RETURN(ret);
- } else {
-@@ -1276,13 +1266,13 @@ static ssize_t cephwrap_llistxattr(struct
vfs_handle_struct *handle, const char
- static ssize_t cephwrap_flistxattr(struct vfs_handle_struct *handle, struct
files_struct *fsp, char *list, size_t size)
- {
- int ret;
-- DEBUG(10, ("[CEPH] flistxattr(%p, %p, %s, %llu)\n", handle, fsp, list,
llu(size)));
-+ DBG_DEBUG("[CEPH] flistxattr(%p, %p, %s, %llu)\n", handle, fsp, list,
llu(size));
- #if LIBCEPHFS_VERSION_CODE >= LIBCEPHFS_VERSION(0, 94, 0)
- ret = ceph_flistxattr(handle->data, fsp->fh->fd, list, size);
- #else
- ret = ceph_listxattr(handle->data, fsp->fsp_name->base_name, list,
size);
- #endif
-- DEBUG(10, ("[CEPH] flistxattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] flistxattr(...) = %d\n", ret);
- if (ret < 0) {
- WRAP_RETURN(ret);
- } else {
-@@ -1293,45 +1283,45 @@ static ssize_t cephwrap_flistxattr(struct
vfs_handle_struct *handle, struct file
- static int cephwrap_removexattr(struct vfs_handle_struct *handle, const char
*path, const char *name)
- {
- int ret;
-- DEBUG(10, ("[CEPH] removexattr(%p, %s, %s)\n", handle, path, name));
-+ DBG_DEBUG("[CEPH] removexattr(%p, %s, %s)\n", handle, path, name);
- ret = ceph_removexattr(handle->data, path, name);
-- DEBUG(10, ("[CEPH] removexattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] removexattr(...) = %d\n", ret);
- WRAP_RETURN(ret);
- }
-
- static int cephwrap_fremovexattr(struct vfs_handle_struct *handle, struct
files_struct *fsp, const char *name)
- {
- int ret;
-- DEBUG(10, ("[CEPH] fremovexattr(%p, %p, %s)\n", handle, fsp, name));
-+ DBG_DEBUG("[CEPH] fremovexattr(%p, %p, %s)\n", handle, fsp, name);
- #if LIBCEPHFS_VERSION_CODE >= LIBCEPHFS_VERSION(0, 94, 0)
- ret = ceph_fremovexattr(handle->data, fsp->fh->fd, name);
- #else
- ret = ceph_removexattr(handle->data, fsp->fsp_name->base_name, name);
- #endif
-- DEBUG(10, ("[CEPH] fremovexattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] fremovexattr(...) = %d\n", ret);
- WRAP_RETURN(ret);
- }
-
- static int cephwrap_setxattr(struct vfs_handle_struct *handle, const char
*path, const char *name, const void *value, size_t size, int flags)
- {
- int ret;
-- DEBUG(10, ("[CEPH] setxattr(%p, %s, %s, %p, %llu, %d)\n", handle, path,
name, value, llu(size), flags));
-+ DBG_DEBUG("[CEPH] setxattr(%p, %s, %s, %p, %llu, %d)\n", handle, path,
name, value, llu(size), flags);
- ret = ceph_setxattr(handle->data, path, name, value, size, flags);
-- DEBUG(10, ("[CEPH] setxattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] setxattr(...) = %d\n", ret);
- WRAP_RETURN(ret);
- }
-
- static int cephwrap_fsetxattr(struct vfs_handle_struct *handle, struct
files_struct *fsp, const char *name, const void *value, size_t size, int flags)
- {
- int ret;
-- DEBUG(10, ("[CEPH] fsetxattr(%p, %p, %s, %p, %llu, %d)\n", handle, fsp,
name, value, llu(size), flags));
-+ DBG_DEBUG("[CEPH] fsetxattr(%p, %p, %s, %p, %llu, %d)\n", handle, fsp,
name, value, llu(size), flags);
- #if LIBCEPHFS_VERSION_CODE >= LIBCEPHFS_VERSION(0, 94, 0)
- ret = ceph_fsetxattr(handle->data, fsp->fh->fd,
- name, value, size, flags);
- #else
- ret = ceph_setxattr(handle->data, fsp->fsp_name->base_name, name,
value, size, flags);
- #endif
-- DEBUG(10, ("[CEPH] fsetxattr(...) = %d\n", ret));
-+ DBG_DEBUG("[CEPH] fsetxattr(...) = %d\n", ret);
- WRAP_RETURN(ret);
- }
-
-@@ -1342,7 +1332,7 @@ static bool cephwrap_aio_force(struct vfs_handle_struct
*handle, struct files_st
- * We do not support AIO yet.
- */
-
-- DEBUG(10, ("[CEPH] cephwrap_aio_force(%p, %p) = false (errno =
ENOTSUP)\n", handle, fsp));
-+ DBG_DEBUG("[CEPH] cephwrap_aio_force(%p, %p) = false (errno =
ENOTSUP)\n", handle, fsp);
- errno = ENOTSUP;
- return false;
- }
---
-2.10.2
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/samba.org/d8a5565ae647352d11d622bd4e73ff4568678a7c
new/patches/samba.org/d8a5565ae647352d11d622bd4e73ff4568678a7c
--- old/patches/samba.org/d8a5565ae647352d11d622bd4e73ff4568678a7c
2017-03-08 20:29:46.000000000 +0100
+++ new/patches/samba.org/d8a5565ae647352d11d622bd4e73ff4568678a7c
1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-From d8a5565ae647352d11d622bd4e73ff4568678a7c Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <a...@samba.org>
-Date: Mon, 19 Sep 2016 16:21:31 +0200
-Subject: [PATCH] waf: Explicitly link against libnss_wins.so
-
-If we do not specify replace as a depencency here, it will not link to
-libreplace using an rpath.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=12277
-
-Signed-off-by: Andreas Schneider <a...@samba.org>
-Reviewed-by: Jeremy Allison <j...@samba.org>
-Reviewed-by: Jim McDonough <j...@samba.org>
-
-Autobuild-User(master): Jim McDonough <j...@samba.org>
-Autobuild-Date(master): Tue Sep 20 08:00:08 CEST 2016 on sn-devel-144
----
- nsswitch/wscript_build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: nsswitch/wscript_build
-===================================================================
---- nsswitch/wscript_build.orig
-+++ nsswitch/wscript_build
-@@ -42,7 +42,7 @@ if (Utils.unversioned_sys_platform() ==
- bld.SAMBA3_LIBRARY('nss_wins',
- keep_underscore=True,
- source='wins.c',
-- deps='''wbclient''',
-+ deps='wbclient replace',
- public_headers=[],
- public_headers_install=False,
- pc_files=[],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2017-03-08 20:29:22.000000000 +0100
+++ new/patches/series 2017-04-10 15:43:34.902188341 +0200
@@ -6,9 +6,6 @@
# Samba patches from upstream, git.samba.org
samba.org/fix_pc_dependencies.diff -p0
-samba.org/0001-VFS-convert-to-using-ceph_statx-structures-and-funct.patch -p0
# bsc 1021933
-samba.org/0002-vfs-ceph-convert-to-new-DBG_-macros.patch -p0 # bsc 1021933
-samba.org/d8a5565ae647352d11d622bd4e73ff4568678a7c -p0 # bnc 995730
# SuSE specific changes
suse/net-kdc-lookup.diff -p0 # perform dns-only lookup for kdcs, bnc 295284
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/suse/0001-ensure-vfstest-is-installed-so-it-can-be-picked-up-b.patch
new/patches/suse/0001-ensure-vfstest-is-installed-so-it-can-be-picked-up-b.patch
---
old/patches/suse/0001-ensure-vfstest-is-installed-so-it-can-be-picked-up-b.patch
2017-01-19 20:13:37.000000000 +0100
+++
new/patches/suse/0001-ensure-vfstest-is-installed-so-it-can-be-picked-up-b.patch
2017-04-03 16:23:22.674916094 +0200
@@ -8,19 +8,16 @@
source3/wscript_build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git source3/wscript_build source3/wscript_build
-index b780710..3fbeebb 100755
---- source3/wscript_build
+Index: source3/wscript_build
+===================================================================
+--- source3/wscript_build.orig
+++ source3/wscript_build
-@@ -1394,7 +1394,7 @@ bld.SAMBA3_BINARY('vfstest',
- vfs
- popt_samba3
- SMBREADLINE''',
+@@ -1285,7 +1285,7 @@ bld.SAMBA3_BINARY('vfstest',
+ smbconf
+ SMBREADLINE
+ ''',
- install=False)
+ install=True)
- bld.SAMBA3_BINARY('log2pcap',
- source='utils/log2pcaphex.c',
---
-2.1.4
-
+ bld.SAMBA3_BINARY('versiontest',
+ source='lib/version_test.c',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/suse/0002-add-new-propagate-inheritance-option-for-smbcacls.patch
new/patches/suse/0002-add-new-propagate-inheritance-option-for-smbcacls.patch
---
old/patches/suse/0002-add-new-propagate-inheritance-option-for-smbcacls.patch
2017-01-19 20:13:37.000000000 +0100
+++
new/patches/suse/0002-add-new-propagate-inheritance-option-for-smbcacls.patch
2017-04-03 16:23:22.674916094 +0200
@@ -12,9 +12,9 @@
source3/utils/smbcacls.c | 684 +++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 667 insertions(+), 17 deletions(-)
-diff --git source3/utils/smbcacls.c source3/utils/smbcacls.c
-index d50219c..86952d0 100644
---- source3/utils/smbcacls.c
+Index: source3/utils/smbcacls.c
+===================================================================
+--- source3/utils/smbcacls.c.orig
+++ source3/utils/smbcacls.c
@@ -6,6 +6,7 @@
Copyright (C) Tim Potter 2000
@@ -38,7 +38,7 @@
static int sddl;
static int query_sec_info = -1;
static int set_sec_info = -1;
-@@ -47,6 +51,17 @@ enum acl_mode {SMB_ACL_SET, SMB_ACL_DELETE, SMB_ACL_MODIFY,
SMB_ACL_ADD };
+@@ -47,6 +51,17 @@ enum acl_mode {SMB_ACL_SET, SMB_ACL_DELE
enum chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP, REQUEST_INHERIT};
enum exit_values {EXIT_OK, EXIT_FAILED, EXIT_PARSE_ERROR};
@@ -56,7 +56,7 @@
static NTSTATUS cli_lsa_lookup_domain_sid(struct cli_state *cli,
struct dom_sid *sid)
{
-@@ -123,12 +138,14 @@ static struct dom_sid *get_domain_sid(struct cli_state
*cli)
+@@ -123,12 +138,14 @@ static struct dom_sid *get_domain_sid(st
}
/* add an ACE to a list of ACEs in a struct security_acl */
@@ -73,7 +73,7 @@
!= NULL);
}
-@@ -138,12 +155,18 @@ static bool add_ace(struct security_acl **the_acl,
struct security_ace *ace)
+@@ -138,12 +155,18 @@ static bool add_ace(struct security_acl
memcpy(aces, (*the_acl)->aces, (*the_acl)->num_aces * sizeof(struct
security_ace));
memcpy(aces+(*the_acl)->num_aces, ace, sizeof(struct security_ace));
@@ -93,7 +93,7 @@
/* parse a ascii version of a security descriptor */
static struct security_descriptor *sec_desc_parse(TALLOC_CTX *ctx, struct
cli_state *cli, char *str)
{
-@@ -250,7 +273,9 @@ static uint16_t get_fileinfo(struct cli_state *cli, const
char *filename)
+@@ -250,7 +273,9 @@ static uint16_t get_fileinfo(struct cli_
/*****************************************************
get sec desc for filename
*******************************************************/
@@ -104,7 +104,7 @@
{
uint16_t fnum = (uint16_t)-1;
struct security_descriptor *sd;
-@@ -284,7 +309,7 @@ static struct security_descriptor *get_secdesc(struct
cli_state *cli, const char
+@@ -284,7 +309,7 @@ static struct security_descriptor *get_s
}
status = cli_query_security_descriptor(cli, fnum, sec_info,
@@ -113,7 +113,7 @@
cli_close(cli, fnum);
-@@ -296,6 +321,11 @@ static struct security_descriptor *get_secdesc(struct
cli_state *cli, const char
+@@ -296,6 +321,11 @@ static struct security_descriptor *get_s
return sd;
}
@@ -125,7 +125,7 @@
/*****************************************************
set sec desc for filename
*******************************************************/
-@@ -485,23 +515,18 @@ static void sort_acl(struct security_acl *the_acl)
+@@ -485,23 +515,18 @@ static void sort_acl(struct security_acl
}
/*****************************************************
@@ -154,7 +154,7 @@
if (!sd) return EXIT_PARSE_ERROR;
if (test_args) return EXIT_OK;
-@@ -612,6 +637,26 @@ static int cacl_set(struct cli_state *cli, const char
*filename,
+@@ -612,6 +637,26 @@ static int cacl_set(struct cli_state *cl
}
/*****************************************************
@@ -181,7 +181,7 @@
set the inherit on a file
*******************************************************/
static int inherit(struct cli_state *cli, const char *filename,
-@@ -780,6 +825,593 @@ static struct cli_state *connect_one(struct
user_auth_info *auth_info,
+@@ -773,6 +818,593 @@ static struct cli_state *connect_one(con
return c;
}
@@ -775,7 +775,7 @@
/****************************************************************************
main program
****************************************************************************/
-@@ -809,6 +1441,7 @@ int main(int argc, char *argv[])
+@@ -802,6 +1434,7 @@ int main(int argc, char *argv[])
{ "chgrp", 'G', POPT_ARG_STRING, NULL, 'G', "Change group
ownership of a file", "GROUPNAME" },
{ "inherit", 'I', POPT_ARG_STRING, NULL, 'I', "Inherit
allow|remove|copy" },
{ "numeric", 0, POPT_ARG_NONE, &numeric, 1, "Don't resolve sids
or masks to names" },
@@ -783,7 +783,7 @@
{ "sddl", 0, POPT_ARG_NONE, &sddl, 1, "Output and input acls in
sddl format" },
{ "query-security-info", 0, POPT_ARG_INT, &query_sec_info, 1,
"The security-info flags for queries"
-@@ -892,8 +1525,11 @@ int main(int argc, char *argv[])
+@@ -879,8 +1512,11 @@ int main(int argc, char *argv[])
break;
}
}
@@ -796,22 +796,22 @@
if(!poptPeekArg(pc)) {
poptPrintUsage(pc, stderr, 0);
return -1;
-@@ -935,6 +1571,7 @@ int main(int argc, char *argv[])
+@@ -919,6 +1555,7 @@ int main(int argc, char *argv[])
*share = 0;
share++;
+ /* Make connection to server */
if (!test_args) {
- cli = connect_one(auth_info, server, share);
+ cli = connect_one(cmdline_auth_info, server, share);
if (!cli) {
-@@ -961,7 +1598,20 @@ int main(int argc, char *argv[])
+@@ -945,7 +1582,20 @@ int main(int argc, char *argv[])
} else if (change_mode != REQUEST_NONE) {
result = owner_set(cli, change_mode, filename, owner_username);
} else if (the_acl) {
- result = cacl_set(cli, filename, the_acl, mode, numeric);
+ if (inheritance) {
+ struct cacl_callback_state cbstate;
-+ cbstate.auth_info = auth_info;
++ cbstate.auth_info = cmdline_auth_info;
+ cbstate.cli = cli;
+ cbstate.aclsd = NULL;
+ cbstate.acl_to_add = NULL;
@@ -826,6 +826,3 @@
} else {
result = cacl_dump(cli, filename, numeric);
}
---
-2.1.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/suse/0002-rpcclient-add-mgmt-command-support.patch
new/patches/suse/0002-rpcclient-add-mgmt-command-support.patch
--- old/patches/suse/0002-rpcclient-add-mgmt-command-support.patch
2017-01-19 20:13:37.000000000 +0100
+++ new/patches/suse/0002-rpcclient-add-mgmt-command-support.patch
2017-04-03 16:23:22.674916094 +0200
@@ -15,9 +15,9 @@
4 files changed, 86 insertions(+), 1 deletion(-)
create mode 100644 source3/rpcclient/cmd_mgmt.c
-diff --git librpc/idl/mgmt.idl librpc/idl/mgmt.idl
-index 17c8cc4..ea6d654 100644
---- librpc/idl/mgmt.idl
+Index: librpc/idl/mgmt.idl
+===================================================================
+--- librpc/idl/mgmt.idl.orig
+++ librpc/idl/mgmt.idl
@@ -8,6 +8,7 @@ import "misc.idl";
uuid("afa8bd80-7d8a-11c9-bef4-08002b102989"),
@@ -27,9 +27,8 @@
helpstring("DCE/RPC Remote Management")
]
interface mgmt
-diff --git source3/rpcclient/cmd_mgmt.c source3/rpcclient/cmd_mgmt.c
-new file mode 100644
-index 0000000..59cbb8e
+Index: source3/rpcclient/cmd_mgmt.c
+===================================================================
--- /dev/null
+++ source3/rpcclient/cmd_mgmt.c
@@ -0,0 +1,80 @@
@@ -113,11 +112,11 @@
+ },
+ { NULL }
+};
-diff --git source3/rpcclient/rpcclient.c source3/rpcclient/rpcclient.c
-index ac7576f..bff7397 100644
---- source3/rpcclient/rpcclient.c
+Index: source3/rpcclient/rpcclient.c
+===================================================================
+--- source3/rpcclient/rpcclient.c.orig
+++ source3/rpcclient/rpcclient.c
-@@ -612,6 +612,7 @@
+@@ -655,6 +655,7 @@ extern struct cmd_set winreg_commands[];
extern struct cmd_set fss_commands[];
extern struct cmd_set witness_commands[];
extern struct cmd_set clusapi_commands[];
@@ -125,7 +124,7 @@
static struct cmd_set *rpcclient_command_list[] = {
rpcclient_commands,
-@@ -634,6 +635,7 @@
+@@ -678,6 +679,7 @@ static struct cmd_set *rpcclient_command
fss_commands,
witness_commands,
clusapi_commands,
@@ -133,28 +132,21 @@
NULL
};
-diff --git source3/wscript_build source3/wscript_build
-index 9103b14..279248a 100755
---- source3/wscript_build
-+++ source3/wscript_build
-@@ -1019,7 +1019,8 @@
- rpcclient/cmd_winreg.c
- rpcclient/cmd_fss.c
- rpcclient/cmd_witness.c
-- rpcclient/cmd_clusapi.c''',
-+ rpcclient/cmd_clusapi.c
-+ rpcclient/cmd_mgmt.c''',
+Index: source3/rpcclient/wscript_build
+===================================================================
+--- source3/rpcclient/wscript_build.orig
++++ source3/rpcclient/wscript_build
+@@ -22,6 +22,7 @@ bld.SAMBA3_BINARY('rpcclient',
+ cmd_clusapi.c
+ cmd_witness.c
+ cmd_iremotewinspool.c
++ cmd_mgmt.c
+ ''',
deps='''
talloc
- popt_samba3
-@@ -1049,6 +1050,7 @@
- RPC_NDR_FSRVP
- RPC_NDR_WITNESS
+@@ -53,4 +54,5 @@ bld.SAMBA3_BINARY('rpcclient',
RPC_NDR_CLUSAPI
+ RPC_NDR_WITNESS
+ RPC_NDR_WINSPOOL
+ RPC_NDR_MGMT
''')
-
- bld.SAMBA3_BINARY('client/smbclient',
---
-1.8.4.5
-
++++++ samba-4.5.3.tar.gz -> samba-4.6.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/samba/samba-4.5.3.tar.gz
/work/SRC/openSUSE:Factory/.samba.new/samba-4.6.2.tar.gz differ: char 5, line 1
++++++ samba.keyring ++++++
--- /var/tmp/diff_new_pack.eRyShM/_old 2017-04-17 10:22:23.747484790 +0200
+++ /var/tmp/diff_new_pack.eRyShM/_new 2017-04-17 10:22:23.751484223 +0200
@@ -1,8 +1,5 @@
-pub 1024D/6568B7EA 2007-02-04 [expires: 2014-02-25]
-uid Samba Distribution Verification Key <samba-b...@samba.org>
-sub 2048g/DA6DFB44 2007-02-04 [expires: 2014-02-25]
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
+Version: GnuPG v1
mQGiBEXGOUcRBACooMht/2pmNT3bKZn1WEFQa+sXe6nxi3G6lH5bIBUKp85SDM57
4qTcBIJXhwfGABeSvyUdZJbBxJDD5bNiO4k+Y5j3t8t9hb2FKgJ1bXL2aO5BbFnJ
@@ -14,29 +11,75 @@
YGl8oV0dc1tG2EfsndDx7QRwrBoxahfsgClN4K8HLtbBy1Ox9kZn+hr1yNEaPdko
+W5bC96Wo2RqnSP09qJ5/tp6rXXCLIgF/+PeCJtP31MaMP0Jo7Q6U2FtYmEgRGlz
dHJpYnV0aW9uIFZlcmlmaWNhdGlvbiBLZXkgPHNhbWJhLWJ1Z3NAc2FtYmEub3Jn
-PohmBBMRAgAmAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAk9Ki3oFCQ1GuTMA
-CgkQbzORW2Vot+oKMQCgxTZ6Gvo6cJsVdVLzUiJPcHD9tW4AnjiOTF6F0G60oPK0
-IxKOjGvVQ+4riEYEEBECAAYFAkXGOXUACgkQXNXaBxV7yV6oTwCgnSEFCs2pAwW5
-LU22AfVDwh9e5AkAn2k0dRoGj2UL/Js4qvf3sBqEw4rriEYEEBECAAYFAkXGOcYA
-CgkQIR7qMdg1EfZyDACgyvRXAmV0XUhH1vbNMEG9+sFXaCwAoOQTsk19i3Luy3Pw
-+1gDaUeCzeLdiEYEEBECAAYFAkXIMMUACgkQ3L4Y/6A1U7wMMACgg4+AVtovhtY6
-y1qip9uZ8qwbnkkAni269FhHSPKfGGEnfkrN/Q2/3EY7iEYEEBECAAYFAkYNcugA
-CgkQp6cLM3ld2XFzGwCffyD/eMhEKCN6j5FCSbb3rhkyR/kAn0PlFtYrTNkrc1dO
-ezhvaZZCPBHWiEYEEBECAAYFAkZQmboACgkQVVCoNUmKuAcl1wCdEzFgS3DIgIhY
-y6Id5a9EqUjArLkAnArdjXskM952gLuyJjgictCiHdIeiEYEEBECAAYFAkZdvkMA
-CgkQw1Ohknblb7ZN8gCgjD/SWG0qBCBD7w19I5kVTijU9j4AmwbPf4wU7hY942tn
-1NxUyKwF+edxuQINBEXGOWEQCADIOV4TpVG6tDXU7YD1VjJ39xduomiWTg94dIOD
-g1bZHLvwUa5I1X7zsjYmghZ5Qa6WxNknbRywWnaP0POMXSMspVWnqBQTZknxdApM
-bMQEko0pPJSLwdTD3+0y5ht4edf08asWdSBT5yvu5Oak4O/Sa3P5lNIe8Q3SjfqR
-YiSX12uWgqeh+2JsQC50Lr9rnz9AMjKqZEx2v7XKnCkxoaFy1XwOpPjJtIuPFaSI
-5OunNsuhXYeGQv7MqqA2RNuulonoHgl9J6YzRBjdmDB28Lm+JKXyJpnHDrUkK6c5
-04EuxVXXQKOvLNPwod3U89OCZ3gFZU/zeESQdpWxXMiQvUqPAAQLCACnbn0cYaXh
-l3UnnQgyPYVUJV12/sAjhlgAQq08SPgTJp4GE/Jx9C2KMS7dlWYH4tjDSbeO+RLL
-d26npdhiy8Cn9UvsJvDs71/+5S2PTpV16eH5QzQZkvJ/PXkkRXQ1Ilovkvt5rKie
-HCx4n6QZb5td9AuAeRZp75UXERO7pXKG/57o/SzswrD/tSEKRpBKQED4eHsPohLw
-3dMKDWG6hLRf4GR8v+xKLFivqXr3ttELb9xS7ZyZqz6FSFucQAp6XY/xjnR3CFzf
-Kq9pHO4PwvhU53uQeI9suAHSPecxfUIcQfrCaN6K6ktEMY+KxeTJUgqB7Fnskqyn
-Cof0MN2OA40+iE8EGBECAA8CGwwFAk9Ki+YFCQ1GuYUACgkQbzORW2Vot+poJACe
-Mx7cSix0y3zIgTvAIty06thlOMUAn1hZdeMtAkWjaKfu8LWk/umBetPI
-=49fm
+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
+=IqTy
-----END PGP PUBLIC KEY BLOCK-----
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor-files/tools/package-data
new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2017-01-25 18:23:36.353908877 +0100
+++ new/vendor-files/tools/package-data 2017-04-10 15:55:14.002480219 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="0"
+SAMBA_PACKAGE_SVN_VERSION="3760"
