Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked
in at 2016-11-03 11:10:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba"
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2016-07-12
23:45:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2016-11-03
11:11:01.000000000 +0100
@@ -1,0 +2,49 @@
+Mon Sep 26 17:55:13 UTC 2016 - nopo...@suse.com
+
+- Include vfstest in samba-test; (bsc#1001203).
+
+-------------------------------------------------------------------
+Wed Sep 21 08:55:37 UTC 2016 - nopo...@suse.com
+
+- s3/winbindd: using default domain with u...@domain.com format
+ fails; (bsc#997833).
+
+-------------------------------------------------------------------
+Tue Sep 20 18:25:21 UTC 2016 - jmcdono...@suse.com
+
+- Fix segfault in libnss_wins; (bso#12277); (bso#12269); (bsc#995730).
+
+-------------------------------------------------------------------
+Wed Sep 14 09:03:18 UTC 2016 - jmcdono...@suse.com
+
+- Update to 4.5.0
+ + NTLM1 Authentication disabled by default
+ + SMB2.1 leases enabled by default
+ + Support for OFD locks
+ + ctdb tool rewritten
+ + Added shadow copy snapshot prefix parameter
+
+-------------------------------------------------------------------
+Tue Aug 30 09:47:01 UTC 2016 - nopo...@suse.com
+
+- Fix illegal memory access after memory has been deleted;
+ (bso#11836); (bsc#975299).
+
+-------------------------------------------------------------------
+Mon Aug 15 14:54:14 UTC 2016 - dd...@suse.com
+
+- Don't package man pages for VFS modules that aren't built;
+ (boo#993707).
+
+-------------------------------------------------------------------
+Sat Aug 13 14:41:26 UTC 2016 - jmcdono...@suse.com
+
+- Fix population of ctdb sysconfig after source merge; (bsc#981566).
+
+-------------------------------------------------------------------
+Fri Aug 12 16:22:33 UTC 2016 - dd...@suse.com
+
+- Enable vfs_ceph builds for Factory (x86-64)
+ + Package as samba-ceph to avoid Ceph dependency in base package.
+
+-------------------------------------------------------------------
Old:
----
samba-4.4.5.tar.asc
samba-4.4.5.tar.gz
New:
----
samba-4.5.0.tar.asc
samba-4.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.8YS3kK/_old 2016-11-03 11:11:04.000000000 +0100
+++ /var/tmp/diff_new_pack.8YS3kK/_new 2016-11-03 11:11:04.000000000 +0100
@@ -21,6 +21,11 @@
%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
+%endif
+%endif
Name: samba
BuildRequires: cups-devel
@@ -120,7 +125,10 @@
%if 0%{?build_ctdb_pmda}
BuildRequires: libpcp-devel
%endif
-%define samba_ver 4.4.5
+%if 0%{?build_vfs_ceph}
+BuildRequires: libcephfs-devel
+%endif
+%define samba_ver 4.5.0
%define samba_ver_suffix %nil
%if "%{samba_ver_suffix}" == ""
%define samba_source_location
https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -142,11 +150,11 @@
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
-%define SOURCE_TIMESTAMP 3678
+%define SOURCE_TIMESTAMP 3712
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
-Version: 4.4.5
+Version: 4.5.0
Release: 0
Url: https://www.samba.org/
Obsoletes: samba-gplv3 < %{version}
@@ -165,14 +173,14 @@
Source2: patches.tar.bz2
Source4: baselibs.conf
Source100: samba-client-rpmlintrc
-PreReq: /usr/bin/getent
-PreReq: /usr/sbin/groupadd
-PreReq: coreutils
-PreReq: grep
+Requires: /usr/bin/getent
+Requires: /usr/sbin/groupadd
+Requires: coreutils
+Requires: grep
%if 0%{?suse_version} > 1220
-PreReq: %{fillup_prereq}
+Requires: %{fillup_prereq}
%endif
-PreReq: samba-client >= %{version}
+Requires: samba-client >= %{version}
# Choose some features / extra packages here
############################################
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
@@ -255,11 +263,11 @@
Obsoletes: samba-gplv3-client < %{version}
Obsoletes: samba-client-gplv2 < %{version}
%if 0%{?suse_version} > 0
-PreReq: %{?insserv_prereq}
+Requires: %{?insserv_prereq}
%endif
-PreReq: /sbin/chkconfig
-PreReq: /sbin/ldconfig
-PreReq: coreutils
+Requires: /sbin/chkconfig
+Requires: /sbin/ldconfig
+Requires: coreutils
%{?systemd_requires}
Requires: cifs-utils
@@ -305,8 +313,8 @@
Summary: Samba Documentation
License: GPL-3.0+
Group: Documentation/Other
-PreReq: coreutils
-PreReq: findutils
+Requires: coreutils
+Requires: findutils
Obsoletes: samba-gplv3-doc < %{version}
Obsoletes: samba-doc-gplv2 < %{version}
%if 0%{?suse_version} > 1110
@@ -328,7 +336,7 @@
License: GPL-3.0+
Group: Development/Libraries/C and C++
Requires: krb5
-PreReq: /sbin/ldconfig
+Requires: /sbin/ldconfig
%if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315
Requires: libfam0-gamin
%endif
@@ -383,7 +391,7 @@
Group: Applications/System
Requires: samba = %{version}
Requires: samba-winbind = %{version}
-PreReq: /sbin/ldconfig
+Requires: /sbin/ldconfig
%description test
samba-test provides testing tools for both the server and client
@@ -409,12 +417,12 @@
Recommends: /usr/sbin/nscd
%endif
%if 0%{?suse_version} > 0
-PreReq: %{?insserv_prereq}
+Requires: %{?insserv_prereq}
%endif
-PreReq: /sbin/ldconfig
-PreReq: /usr/sbin/groupadd
-PreReq: coreutils
-PreReq: samba-client >= %{version}
+Requires: /sbin/ldconfig
+Requires: /usr/sbin/groupadd
+Requires: coreutils
+Requires: samba-client >= %{version}
%description winbind
This is the winbind-daemon and the wbinfo-tool.
@@ -942,7 +950,7 @@
Summary: Samba Client Library
License: GPL-3.0+
Group: System/Libraries
-PreReq: /sbin/ldconfig
+Requires: /sbin/ldconfig
%description -n %{libsmbclient_name}
This package includes the libsmbclient library.
@@ -973,7 +981,7 @@
Summary: Samba netapi Library
License: GPL-3.0+
Group: System/Libraries
-PreReq: /sbin/ldconfig
+Requires: /sbin/ldconfig
%description -n %{libnetapi_name}
This package includes the netapi library.
@@ -1001,7 +1009,7 @@
Summary: Samba libwbclient Library
License: LGPL-3.0+
Group: System/Libraries
-PreReq: /sbin/ldconfig
+Requires: /sbin/ldconfig
%if 0%{?suse_version} > 1030
Recommends: samba-winbind = %{version}-%{release}
%endif
@@ -1027,6 +1035,16 @@
Source Timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
+%if 0%{?build_vfs_ceph}
+%package ceph
+Summary: Ceph VFS Module for Samba
+License: GPL-3.0+
+Group: Productivity/Networking/Samba
+
+%description ceph
+The Ceph VFS module for Samba allows shares to be backed by the Ceph
distributed file system.
+%endif
+
%prep
%setup -n samba-%{samba_ver_full} -q
@@ -1183,7 +1201,7 @@
%if 0%{?suse_version}
install -m 0644 vendor-files/config/sysconfig.ctdb
%{buildroot}/%{_var}/adm/fillup-templates
%else
-install -m 0644 ctdb/config/ctdb.sysconfig
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
+install -m 0644 vendor-files/config/sysconfig.ctdb
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
%endif
%if 0%{?suse_version} > 1220
install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
@@ -1196,7 +1214,7 @@
ln -s %{_sysconfdir}/init.d/ctdb %{buildroot}/%{_sbindir}/rcctdb
%endif
mkdir %{buildroot}/%{_defaultdocdir}/ctdb
-for file in README COPYING NEWS doc/examples doc/*.html
doc/readonlyrecords.txt doc/recovery-process.txt ; do
+for file in README COPYING doc/examples doc/*.html doc/readonlyrecords.txt
doc/recovery-process.txt ; do
cp -a ctdb/${file} %{buildroot}/%{_defaultdocdir}/ctdb
done
touch %{buildroot}/%{_sysconfdir}/ctdb/nodes
@@ -1359,8 +1377,37 @@
echo "%doc ${file#%{buildroot}}"
>>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc"
done
for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do
+ # if built we don't want vfs_ceph in the base package
+ case "${file#%{buildroot}}" in
+ %{_libdir}/samba/vfs/ceph.so) continue ;;
+ esac
echo "${file#%{buildroot}}"
>>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba
done
+# only package Man pages for VFS modules that we ship
+for file in %{buildroot}%{_mandir}/man8/vfs_*; do
+ case "${file#%{buildroot}}" in
+ %{_mandir}/man8/vfs_ceph.8)
+ %if 0%{?build_vfs_ceph} == 0
+ rm ${file}
+ %endif
+ continue
+ ;;
+ %{_mandir}/man8/vfs_glusterfs.8)
+ rm ${file}
+ continue
+ ;;
+ %{_mandir}/man8/vfs_gpfs.8)
+ rm ${file}
+ continue
+ ;;
+ %{_mandir}/man8/vfs_tsmsm.8)
+ rm ${file}
+ continue
+ ;;
+ esac
+ # wildcard suffix to account for subsequent gzip
+ echo "${file#%{buildroot}}*"
>>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba
+done
# copy the schema
install -m 0644 examples/LDAP/samba.schema
%{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema
install -m 0644 examples/LDAP/samba-nds.schema
%{buildroot}/%{_datadir}/samba/LDAP/samba-nds.schema
@@ -1598,11 +1645,11 @@
%post -n ctdb
%if 0%{?suse_version}
%if 0%{?suse_version} > 1220
-%{fillup_only}
+%{fillup_only -n ctdb}
%service_add_post ctdb.service
%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/ctdb.conf || :
%else
-%{fillup_and_insserv}
+%{fillup_and_insserv -n ctdb}
%endif
%endif
@@ -1676,49 +1723,6 @@
%{_mandir}/man5/smbpasswd.5.*
%{_mandir}/man8/nmbd.8.*
%{_mandir}/man8/smbd.8.*
-%{_mandir}/man8/vfs_acl_tdb.8.*
-%{_mandir}/man8/vfs_acl_xattr.8.*
-%{_mandir}/man8/vfs_aio_fork.8.*
-%{_mandir}/man8/vfs_aio_linux.8.*
-%{_mandir}/man8/vfs_aio_pthread.8.*
-%{_mandir}/man8/vfs_audit.8.*
-%{_mandir}/man8/vfs_btrfs.8.*
-%{_mandir}/man8/vfs_cacheprime.8.*
-%{_mandir}/man8/vfs_cap.8.*
-%{_mandir}/man8/vfs_catia.8.*
-%{_mandir}/man8/vfs_ceph.8.*
-%{_mandir}/man8/vfs_commit.8.*
-%{_mandir}/man8/vfs_crossrename.8.*
-%{_mandir}/man8/vfs_default_quota.8.*
-%{_mandir}/man8/vfs_dirsort.8.*
-%{_mandir}/man8/vfs_extd_audit.8.*
-%{_mandir}/man8/vfs_fake_perms.8.*
-%{_mandir}/man8/vfs_fileid.8.*
-%{_mandir}/man8/vfs_full_audit.8.*
-%{_mandir}/man8/vfs_fruit.8.*
-%{_mandir}/man8/vfs_glusterfs.8.*
-%{_mandir}/man8/vfs_gpfs.8.*
-%{_mandir}/man8/vfs_linux_xfs_sgid.8.*
-%{_mandir}/man8/vfs_media_harmony.8.*
-%{_mandir}/man8/vfs_netatalk.8.*
-%{_mandir}/man8/vfs_offline.8.*
-%{_mandir}/man8/vfs_prealloc.8.*
-%{_mandir}/man8/vfs_preopen.8.*
-%{_mandir}/man8/vfs_readahead.8.*
-%{_mandir}/man8/vfs_readonly.8.*
-%{_mandir}/man8/vfs_recycle.8.*
-%{_mandir}/man8/vfs_shadow_copy.8.*
-%{_mandir}/man8/vfs_shadow_copy2.8.*
-%{_mandir}/man8/vfs_shell_snap.8.*
-%{_mandir}/man8/vfs_snapper.8.*
-%{_mandir}/man8/vfs_streams_depot.8.*
-%{_mandir}/man8/vfs_streams_xattr.8.*
-%{_mandir}/man8/vfs_syncops.8.*
-%{_mandir}/man8/vfs_time_audit.8.*
-%{_mandir}/man8/vfs_tsmsm.8.*
-%{_mandir}/man8/vfs_unityed_media.8.*
-%{_mandir}/man8/vfs_worm.8.*
-%{_mandir}/man8/vfs_xattr_tdb.8.*
%if 0%{?suse_version} && 0%{?suse_version} < 1021
%{_includedir}/samba
%endif
@@ -1760,6 +1764,7 @@
%{_bindir}/cifsdd
%{_bindir}/dbwrap_tool
%{_bindir}/eventlogadm
+%{_bindir}/findsmb
%{_bindir}/net
%{_bindir}/nmblookup
%{_bindir}/oLschema2ldif
@@ -1792,7 +1797,7 @@
%{_libdir}/samba/charset
%{_libdir}/samba/smbspool_krb5_wrapper
%{_mandir}/man1/dbwrap_tool.1.*
-%exclude %doc %{_mandir}/man1/findsmb.1.*
+%{_mandir}/man1/findsmb.1.*
%{_mandir}/man1/log2pcap.1.*
%{_mandir}/man1/nmblookup.1.*
%{_mandir}/man1/nmbstatus.1.*
@@ -1945,6 +1950,7 @@
%{_libdir}/samba/libnpa-tstream-samba4.so
%{_libdir}/samba/libnss-info-samba4.so
%{_libdir}/samba/libpopt-samba3-samba4.so
+%{_libdir}/samba/libposix-eadb-samba4.so
%{_libdir}/samba/libprinting-migrate-samba4.so
%{_libdir}/samba/libregistry-samba4.so
%{_libdir}/samba/libreplace-samba4.so
@@ -2012,6 +2018,7 @@
%{_bindir}/masktest
%{_bindir}/ndrdump
%{_bindir}/smbtorture
+%{_bindir}/vfstest
%{_mandir}/man1/gentest.1.*
%{_mandir}/man1/locktest.1.*
%{_mandir}/man1/masktest.1.*
@@ -2050,6 +2057,7 @@
%{_mandir}/man8/idmap_nss.8.*
%{_mandir}/man8/idmap_rfc2307.8.*
%{_mandir}/man8/idmap_rid.8.*
+%{_mandir}/man8/idmap_script.8.*
%{_mandir}/man8/idmap_tdb.8.*
%{_mandir}/man8/idmap_tdb2.8.*
%{_mandir}/man8/pam_winbind.8.*
@@ -2101,6 +2109,7 @@
%config %{_sysconfdir}/ctdb/events.d/00.ctdb
%config %{_sysconfdir}/ctdb/events.d/01.reclock
%config %{_sysconfdir}/ctdb/events.d/05.system
+%config %{_sysconfdir}/ctdb/events.d/06.nfs
%config %{_sysconfdir}/ctdb/events.d/10.external
%config %{_sysconfdir}/ctdb/events.d/10.interface
%config %{_sysconfdir}/ctdb/events.d/11.natgw
@@ -2143,6 +2152,9 @@
%{_libdir}/ctdb/ctdb_natgw
%{_libdir}/ctdb/ctdb_recovery_helper
%{_libdir}/ctdb/smnotify
+%{_libdir}/ctdb/ctdb_killtcp
+%{_libdir}/ctdb/ctdb_lvs
+%{_libdir}/ctdb/ctdb_mutex_fcntl_helper
%dir %{_localstatedir}/lib/ctdb
%dir %{_localstatedir}/lib/ctdb/persistent
%dir %{_localstatedir}/log/ctdb
@@ -2154,6 +2166,7 @@
%{_mandir}/man1/ctdb.1.gz
%{_mandir}/man1/ctdbd.1.gz
%{_mandir}/man1/ctdbd_wrapper.1.gz
+%{_mandir}/man1/ctdb_diagnostics.1.gz
%{_mandir}/man1/ltdbtool.1.gz
%{_mandir}/man1/onnode.1.gz
%{_mandir}/man1/ping_pong.1.gz
@@ -2180,36 +2193,33 @@
%files -n ctdb-tests
%defattr(-,root,root)
-%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_bench
-%{_libdir}/ctdb-tests/ctdb_fetch
-%{_libdir}/ctdb-tests/ctdb_fetch_one
-%{_libdir}/ctdb-tests/ctdb_fetch_readonly_loop
-%{_libdir}/ctdb-tests/ctdb_fetch_readonly_once
-%{_libdir}/ctdb-tests/ctdb_functest
-%{_libdir}/ctdb-tests/ctdb_lock_tdb
-%{_libdir}/ctdb-tests/ctdb_persistent
-%{_libdir}/ctdb-tests/ctdb_porting_tests
-%{_libdir}/ctdb-tests/ctdb_randrec
-%{_libdir}/ctdb-tests/ctdb_store
-%{_libdir}/ctdb-tests/ctdb_stubtest
-%{_libdir}/ctdb-tests/ctdb_takeover_tests
-%{_libdir}/ctdb-tests/ctdb_trackingdb_test
-%{_libdir}/ctdb-tests/ctdb_transaction
-%{_libdir}/ctdb-tests/ctdb_traverse
-%{_libdir}/ctdb-tests/ctdb_update_record
-%{_libdir}/ctdb-tests/ctdb_update_record_persistent
-%{_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
+%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
%dir %{_datadir}/ctdb-tests
%dir %{_datadir}/ctdb-tests/eventscripts
%dir %{_datadir}/ctdb-tests/eventscripts/etc-ctdb
@@ -2225,6 +2235,7 @@
%{_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
@@ -2268,6 +2279,7 @@
%dir %_includedir/samba-4.0/gen_ndr/
%_includedir/samba-4.0/gen_ndr/krb5pac.h
%_includedir/samba-4.0/gen_ndr/ndr_krb5pac.h
+%_includedir/samba-4.0/ndr/ndr_krb5pac.h
%_libdir/libndr-krb5pac.so
%_libdir/pkgconfig/ndr_krb5pac.pc
@@ -2452,7 +2464,6 @@
%files -n libtevent-util0
%defattr(-,root,root)
-%_libdir/libtevent-unix-util.so.0*
%_libdir/libtevent-util.so.0*
%files -n libtevent-util-devel
@@ -2462,7 +2473,6 @@
%_includedir/samba-4.0/util/tevent_ntstatus.h
%_includedir/samba-4.0/util/tevent_unix.h
%_includedir/samba-4.0/util/tevent_werror.h
-%_libdir/libtevent-unix-util.so
%_libdir/libtevent-util.so
%files -n %{libwbclient_name}
@@ -2476,4 +2486,11 @@
%{_libdir}/libwbclient.so
%{_libdir}/pkgconfig/wbclient.pc
+%if 0%{?build_vfs_ceph}
+%files ceph
+%defattr(-,root,root)
+%{_mandir}/man8/vfs_ceph.8.*
+%{_libdir}/samba/vfs/ceph.so
+%endif
+
%changelog
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/samba.org/9a274d9ae76ddad9a0b609bddfa007afee61c0ca
new/patches/samba.org/9a274d9ae76ddad9a0b609bddfa007afee61c0ca
--- old/patches/samba.org/9a274d9ae76ddad9a0b609bddfa007afee61c0ca
2016-06-20 16:44:30.000000000 +0200
+++ new/patches/samba.org/9a274d9ae76ddad9a0b609bddfa007afee61c0ca
1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-commit 9a274d9ae76ddad9a0b609bddfa007afee61c0ca
-Author: Jim McDonough <j...@samba.org>
-Date: Wed Jun 15 15:57:01 2016 -0400
-
- winbind: honor 'socket options' in winbind
-
- Set socket options from smb.conf before negprot, as done by libsmbclient
-
- Signed-off-by: Jim McDonough <j...@samba.org>
- Reviewed-by: Jeremy Allison <j...@samba.org>
-
-Index: source3/winbindd/winbindd_cm.c
-===================================================================
---- source3/winbindd/winbindd_cm.c.orig
-+++ source3/winbindd/winbindd_cm.c
-@@ -1048,6 +1048,8 @@ static NTSTATUS cm_prepare_connection(st
-
- cli_set_timeout(*cli, 10000); /* 10 seconds */
-
-+ set_socket_options(sockfd, lp_socket_options());
-+
- result = smbXcli_negprot((*cli)->conn, (*cli)->timeout,
- lp_client_ipc_min_protocol(),
- lp_client_ipc_max_protocol());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/samba.org/nss-wins-missing-parameters.patch
new/patches/samba.org/nss-wins-missing-parameters.patch
--- old/patches/samba.org/nss-wins-missing-parameters.patch 1970-01-01
01:00:00.000000000 +0100
+++ new/patches/samba.org/nss-wins-missing-parameters.patch 2016-09-27
12:20:42.000000000 +0200
@@ -0,0 +1,163 @@
+From 49f99b1e2ad5c34b071687d6215a1d585985a78f Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <a...@samba.org>
+Date: Mon, 19 Sep 2016 16:17:11 +0200
+Subject: [PATCH 1/2] nsswitch: Add missing arguments to wins gethostbyname*
+
+The errno pointer argument is missing.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=12269
+
+Signed-off-by: Andreas Schneider <a...@samba.org>
+---
+ nsswitch/wins.c | 51 +++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 41 insertions(+), 10 deletions(-)
+
+Index: nsswitch/wins.c
+===================================================================
+--- nsswitch/wins.c.orig
++++ nsswitch/wins.c
+@@ -39,10 +39,19 @@ static pthread_mutex_t wins_nss_mutex =
+ #define INADDRSZ 4
+ #endif
+
+-NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, struct hostent *he,
+- char *buffer, size_t buflen, int *h_errnop);
+-NSS_STATUS _nss_wins_gethostbyname2_r(const char *name, int af, struct
hostent *he,
+- char *buffer, size_t buflen, int *h_errnop);
++NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
++ struct hostent *he,
++ char *buffer,
++ size_t buflen,
++ int *errnop,
++ int *h_errnop);
++NSS_STATUS _nss_wins_gethostbyname2_r(const char *name,
++ int af,
++ struct hostent *he,
++ char *buffer,
++ size_t buflen,
++ int *errnop,
++ int *h_errnop);
+
+ static char *lookup_byname_backend(const char *name)
+ {
+@@ -225,8 +234,12 @@ gethostbyname() - we ignore any domain p
+ handle names that are at most 15 characters long
+ **************************************************************************/
+ NSS_STATUS
+-_nss_wins_gethostbyname_r(const char *hostname, struct hostent *he,
+- char *buffer, size_t buflen, int *h_errnop)
++_nss_wins_gethostbyname_r(const char *hostname,
++ struct hostent *he,
++ char *buffer,
++ size_t buflen,
++ int *errnop,
++ int *h_errnop)
+ {
+ NSS_STATUS nss_status = NSS_STATUS_SUCCESS;
+ char *ip;
+@@ -247,6 +260,7 @@ _nss_wins_gethostbyname_r(const char *ho
+
+ ip = lookup_byname_backend(name);
+ if (ip == NULL) {
++ *errnop = EINVAL;
+ nss_status = NSS_STATUS_NOTFOUND;
+ goto out;
+ }
+@@ -254,6 +268,7 @@ _nss_wins_gethostbyname_r(const char *ho
+ rc = inet_pton(AF_INET, ip, &in);
+ wbcFreeMemory(ip);
+ if (rc == 0) {
++ *errnop = errno;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -263,6 +278,7 @@ _nss_wins_gethostbyname_r(const char *ho
+ namelen = strlen(name) + 1;
+
+ if ((he->h_name = get_static(&buffer, &buflen, namelen)) == NULL) {
++ *errnop = EAGAIN;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -275,18 +291,21 @@ _nss_wins_gethostbyname_r(const char *ho
+ i = sizeof(char*) - i;
+
+ if (get_static(&buffer, &buflen, i) == NULL) {
++ *errnop = EAGAIN;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+
+ if ((he->h_addr_list = (char **)get_static(
+ &buffer, &buflen, 2 * sizeof(char *))) == NULL) {
++ *errnop = EAGAIN;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+
+ if ((he->h_addr_list[0] = get_static(&buffer, &buflen,
+ INADDRSZ)) == NULL) {
++ *errnop = EAGAIN;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -306,12 +325,14 @@ _nss_wins_gethostbyname_r(const char *ho
+ i = sizeof(char*) - i;
+
+ if (get_static(&buffer, &buflen, i) == NULL) {
++ *errnop = EAGAIN;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+
+ if ((he->h_aliases = (char **)get_static(
+ &buffer, &buflen, sizeof(char *))) == NULL) {
++ *errnop = EAGAIN;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -330,17 +351,27 @@ _nss_wins_gethostbyname_r(const char *ho
+
+
+ NSS_STATUS
+-_nss_wins_gethostbyname2_r(const char *name, int af, struct hostent *he,
+- char *buffer, size_t buflen, int *h_errnop)
++_nss_wins_gethostbyname2_r(const char *name,
++ int af,
++ struct hostent *he,
++ char *buffer,
++ size_t buflen,
++ int *errnop,
++ int *h_errnop)
+ {
+ NSS_STATUS nss_status;
+
+ if(af!=AF_INET) {
++ *errnop = EAFNOSUPPORT;
+ *h_errnop = NO_DATA;
+ nss_status = NSS_STATUS_UNAVAIL;
+ } else {
+- nss_status = _nss_wins_gethostbyname_r(
+- name, he, buffer, buflen, h_errnop);
++ nss_status = _nss_wins_gethostbyname_r(name,
++ he,
++ buffer,
++ buflen,
++ errnop,
++ h_errnop);
+ }
+ return nss_status;
+ }
+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/samba.org/set-h_errnop-for-nss_wins-functions.patch
new/patches/samba.org/set-h_errnop-for-nss_wins-functions.patch
--- old/patches/samba.org/set-h_errnop-for-nss_wins-functions.patch
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/set-h_errnop-for-nss_wins-functions.patch
2016-09-27 12:20:42.000000000 +0200
@@ -0,0 +1,87 @@
+From f0d3337a2a04b498a59441453a3f1253053e27e3 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <a...@samba.org>
+Date: Tue, 20 Sep 2016 13:26:52 +0200
+Subject: [PATCH] nsswitch: Also set h_errnop for nss_wins functions
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=12269
+
+Signed-off-by: Andreas Schneider <a...@samba.org>
+---
+ nsswitch/wins.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+Index: nsswitch/wins.c
+===================================================================
+--- nsswitch/wins.c.orig
++++ nsswitch/wins.c
+@@ -261,6 +261,7 @@ _nss_wins_gethostbyname_r(const char *ho
+ ip = lookup_byname_backend(name);
+ if (ip == NULL) {
+ *errnop = EINVAL;
++ *h_errnop = NETDB_INTERNAL;
+ nss_status = NSS_STATUS_NOTFOUND;
+ goto out;
+ }
+@@ -269,6 +270,7 @@ _nss_wins_gethostbyname_r(const char *ho
+ wbcFreeMemory(ip);
+ if (rc == 0) {
+ *errnop = errno;
++ *h_errnop = NETDB_INTERNAL;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -279,6 +281,7 @@ _nss_wins_gethostbyname_r(const char *ho
+
+ if ((he->h_name = get_static(&buffer, &buflen, namelen)) == NULL) {
+ *errnop = EAGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -292,6 +295,7 @@ _nss_wins_gethostbyname_r(const char *ho
+
+ if (get_static(&buffer, &buflen, i) == NULL) {
+ *errnop = EAGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -299,6 +303,7 @@ _nss_wins_gethostbyname_r(const char *ho
+ if ((he->h_addr_list = (char **)get_static(
+ &buffer, &buflen, 2 * sizeof(char *))) == NULL) {
+ *errnop = EAGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -306,6 +311,7 @@ _nss_wins_gethostbyname_r(const char *ho
+ if ((he->h_addr_list[0] = get_static(&buffer, &buflen,
+ INADDRSZ)) == NULL) {
+ *errnop = EAGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -326,6 +332,7 @@ _nss_wins_gethostbyname_r(const char *ho
+
+ if (get_static(&buffer, &buflen, i) == NULL) {
+ *errnop = EAGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+@@ -333,12 +340,14 @@ _nss_wins_gethostbyname_r(const char *ho
+ if ((he->h_aliases = (char **)get_static(
+ &buffer, &buflen, sizeof(char *))) == NULL) {
+ *errnop = EAGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ nss_status = NSS_STATUS_TRYAGAIN;
+ goto out;
+ }
+
+ he->h_aliases[0] = NULL;
+
++ *h_errnop = NETDB_SUCCESS;
+ nss_status = NSS_STATUS_SUCCESS;
+
+ out:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2016-06-20 16:45:51.000000000 +0200
+++ new/patches/series 2016-10-06 12:46:37.000000000 +0200
@@ -5,7 +5,8 @@
# allows quilt to work in the usual way (= outside of our RPM spec file).
# Samba patches from upstream, git.samba.org
-samba.org/9a274d9ae76ddad9a0b609bddfa007afee61c0ca -p0 # bsc 975131
+samba.org/nss-wins-missing-parameters.patch -p0 # bso 12269, bso 12277, bsc
995730
+samba.org/set-h_errnop-for-nss_wins-functions.patch -p0 # bso 12269, bso
12277, bsc 995730
samba.org/fix_pc_dependencies.diff -p0
# SuSE specific changes
@@ -25,4 +26,6 @@
suse/0004-doc-describe-smbcacls-propagate-inheritance-expandin.patch -p0 #
fate 316474
suse/0001-add-smbcacls-test-based-on-test_smbclient_tarmode.pl.patch -p0 #
fate 316474
suse/0002-Adjust-test-cater-for-presense-of-winbind-separator-.patch -p0 #
fate 316474
+suse/0001-s3-winbindd-using-default-domain-with-user-domain.co.patch -p0 #bnc
997833
+suse/0001-ensure-vfstest-is-installed-so-it-can-be-picked-up-b.patch -p0 # bnc
1001203
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/suse/0001-If-samlogon-for-trusted-child-domain-user-fails-atte.patch
new/patches/suse/0001-If-samlogon-for-trusted-child-domain-user-fails-atte.patch
---
old/patches/suse/0001-If-samlogon-for-trusted-child-domain-user-fails-atte.patch
2016-02-27 15:50:28.000000000 +0100
+++
new/patches/suse/0001-If-samlogon-for-trusted-child-domain-user-fails-atte.patch
2016-10-06 21:06:45.000000000 +0200
@@ -26,7 +26,7 @@
index 73cf0f4..ed5357c 100644
--- nsswitch/winbind_struct_protocol.h
+++ nsswitch/winbind_struct_protocol.h
-@@ -224,6 +224,13 @@ typedef struct winbindd_gr {
+@@ -226,6 +226,13 @@ typedef struct winbindd_gr {
/* Flag to tell winbind the NTLMv2 blob is too big for the struct and is in
the
* extra_data field */
#define WBFLAG_BIG_NTLMV2_BLOB 0x00010000
@@ -44,7 +44,7 @@
index c883efa..f3f0e15 100644
--- source3/winbindd/winbindd_pam.c
+++ source3/winbindd/winbindd_pam.c
-@@ -1763,13 +1763,35 @@ enum winbindd_result winbindd_dual_pam_auth(struct
winbindd_domain *domain,
+@@ -1770,13 +1770,35 @@ enum winbindd_result winbindd_dual_pam_auth(struct
winbindd_domain *domain,
sam_logon:
/* Check for Samlogon authentication */
if (domain->online) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/suse/0001-add-smbcacls-test-based-on-test_smbclient_tarmode.pl.patch
new/patches/suse/0001-add-smbcacls-test-based-on-test_smbclient_tarmode.pl.patch
---
old/patches/suse/0001-add-smbcacls-test-based-on-test_smbclient_tarmode.pl.patch
2016-04-13 13:16:07.000000000 +0200
+++
new/patches/suse/0001-add-smbcacls-test-based-on-test_smbclient_tarmode.pl.patch
2016-10-06 21:06:45.000000000 +0200
@@ -3094,7 +3094,7 @@
index 71b4e21..0dfa09e 100755
--- source3/selftest/tests.py
+++ source3/selftest/tests.py
-@@ -217,6 +217,28 @@ for env in ["fileserver"]:
+@@ -227,6 +227,28 @@ for env in ["fileserver"]:
'-d', '$PREFIX', '-b', smbclient3,
'--subunit', '--', configuration])
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
1970-01-01 01:00:00.000000000 +0100
+++
new/patches/suse/0001-ensure-vfstest-is-installed-so-it-can-be-picked-up-b.patch
2016-10-06 12:46:05.000000000 +0200
@@ -0,0 +1,26 @@
+From 209db14d562c2ae08d4f034371938aa5a4a60191 Mon Sep 17 00:00:00 2001
+From: Noel Power <noel.po...@suse.com>
+Date: Mon, 26 Sep 2016 19:45:12 +0100
+Subject: [PATCH] ensure vfstest is installed so it can be picked up by test
+ package
+
+---
+ 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
++++ source3/wscript_build
+@@ -1394,7 +1394,7 @@ bld.SAMBA3_BINARY('vfstest',
+ vfs
+ popt_samba3
+ SMBREADLINE''',
+- install=False)
++ install=True)
+
+ bld.SAMBA3_BINARY('log2pcap',
+ source='utils/log2pcaphex.c',
+--
+2.1.4
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/suse/0001-s3-rpc-add-skeleton-mgmt-RPC-server.patch
new/patches/suse/0001-s3-rpc-add-skeleton-mgmt-RPC-server.patch
--- old/patches/suse/0001-s3-rpc-add-skeleton-mgmt-RPC-server.patch
2016-03-04 18:44:49.000000000 +0100
+++ new/patches/suse/0001-s3-rpc-add-skeleton-mgmt-RPC-server.patch
2016-09-27 12:20:42.000000000 +0200
@@ -15,11 +15,11 @@
4 files changed, 101 insertions(+)
create mode 100644 source3/rpc_server/mgmt/srv_mgmt_nt.c
-diff --git source3/param/loadparm.c source3/param/loadparm.c
-index 5ab0de7..173a101 100644
---- source3/param/loadparm.c
+Index: source3/param/loadparm.c
+===================================================================
+--- source3/param/loadparm.c.orig
+++ source3/param/loadparm.c
-@@ -3700,6 +3700,7 @@
+@@ -3707,6 +3707,7 @@ static void lp_enforce_ad_dc_settings(vo
lp_do_parameter(GLOBAL_SECTION_SNUM, "rpc_server:default", "external");
lp_do_parameter(GLOBAL_SECTION_SNUM, "rpc_server:svcctl", "embedded");
lp_do_parameter(GLOBAL_SECTION_SNUM, "rpc_server:srvsvc", "embedded");
@@ -27,9 +27,8 @@
lp_do_parameter(GLOBAL_SECTION_SNUM, "rpc_server:eventlog", "embedded");
lp_do_parameter(GLOBAL_SECTION_SNUM, "rpc_server:ntsvcs", "embedded");
lp_do_parameter(GLOBAL_SECTION_SNUM, "rpc_server:winreg", "embedded");
-diff --git source3/rpc_server/mgmt/srv_mgmt_nt.c
source3/rpc_server/mgmt/srv_mgmt_nt.c
-new file mode 100644
-index 0000000..c0a4122
+Index: source3/rpc_server/mgmt/srv_mgmt_nt.c
+===================================================================
--- /dev/null
+++ source3/rpc_server/mgmt/srv_mgmt_nt.c
@@ -0,0 +1,70 @@
@@ -103,9 +102,9 @@
+ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+}
-diff --git source3/rpc_server/rpc_service_setup.c
source3/rpc_server/rpc_service_setup.c
-index b8bb8ae..e0c7e43 100644
---- source3/rpc_server/rpc_service_setup.c
+Index: source3/rpc_server/rpc_service_setup.c
+===================================================================
+--- source3/rpc_server/rpc_service_setup.c.orig
+++ source3/rpc_server/rpc_service_setup.c
@@ -32,6 +32,7 @@
#include "../librpc/gen_ndr/srv_eventlog.h"
@@ -115,9 +114,9 @@
#include "../librpc/gen_ndr/srv_netlogon.h"
#include "../librpc/gen_ndr/srv_ntsvcs.h"
#include "../librpc/gen_ndr/srv_samr.h"
-@@ -495,6 +496,24 @@ static bool rpc_setup_mdssvc(struct teve
+@@ -446,6 +447,24 @@ static bool rpc_setup_initshutdown(struc
+ return rpc_setup_embedded(ev_ctx, msg_ctx, t, NULL);
}
- #endif
+static bool rpc_setup_mgmt(struct tevent_context *ev_ctx,
+ struct messaging_context *msg_ctx)
@@ -140,9 +139,9 @@
bool dcesrv_ep_setup(struct tevent_context *ev_ctx,
struct messaging_context *msg_ctx)
{
-@@ -585,6 +604,11 @@ bool dcesrv_ep_setup(struct tevent_conte
+@@ -562,6 +581,11 @@ bool dcesrv_ep_setup(struct tevent_conte
+ goto done;
}
- #endif
+ ok = rpc_setup_mgmt(ev_ctx, msg_ctx);
+ if (!ok) {
@@ -152,13 +151,13 @@
done:
talloc_free(tmp_ctx);
return ok;
-diff --git source3/rpc_server/wscript_build source3/rpc_server/wscript_build
-index 481d39c..77f7d8a 100755
---- source3/rpc_server/wscript_build
+Index: source3/rpc_server/wscript_build
+===================================================================
+--- source3/rpc_server/wscript_build.orig
+++ source3/rpc_server/wscript_build
-@@ -140,6 +140,11 @@ bld.SAMBA3_SUBSYSTEM('RPC_MDSSVC',
- deps='samba-util ' + bld.env['libtracker'],
- enabled=bld.env.with_spotlight)
+@@ -144,6 +144,11 @@ bld.SAMBA3_MODULE('rpc_mdssvc_module',
+
internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_mdssvc_module'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_mdssvc_module'))
+bld.SAMBA3_SUBSYSTEM('RPC_MGMT',
+ source='''mgmt/srv_mgmt_nt.c
@@ -168,14 +167,11 @@
# RPC_SERVICE
bld.SAMBA3_SUBSYSTEM('RPC_SERVER_REGISTER',
source='rpc_ep_register.c ../librpc/rpc/dcerpc_ep.c',
-@@ -168,6 +168,7 @@
+@@ -172,6 +177,7 @@ bld.SAMBA3_SUBSYSTEM('RPC_SERVICE',
+ RPC_SERVER
RPC_EPMAPPER
RPC_FSS_AGENT
- RPC_MDSSVC
+ RPC_MGMT
''')
# RPC_DAEMONS
---
-1.8.4.5
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/suse/0001-s3-winbindd-using-default-domain-with-user-domain.co.patch
new/patches/suse/0001-s3-winbindd-using-default-domain-with-user-domain.co.patch
---
old/patches/suse/0001-s3-winbindd-using-default-domain-with-user-domain.co.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/patches/suse/0001-s3-winbindd-using-default-domain-with-user-domain.co.patch
2016-10-06 12:46:05.000000000 +0200
@@ -0,0 +1,39 @@
+From a957beaac1220f60a99d4b9897a9e096b58cea79 Mon Sep 17 00:00:00 2001
+From: Noel Power <noel.po...@suse.com>
+Date: Tue, 20 Sep 2016 11:49:49 +0100
+Subject: [PATCH] s3/winbindd: using default domain with u...@domain.com format
+ fails
+
+For example for samba client joined to a windows AD DC the following
+commands fail if 'winbind use default domain = yes'
+ getent passwd u...@domain.com
+ ssh -o user=u...@domain.com localhost
+
+The same commands succeed if the setting above has the default 'no' value
+
+Signed-off-by: Noel Power <noel.po...@suse.com>
+---
+ source3/winbindd/winbindd_util.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git source3/winbindd/winbindd_util.c source3/winbindd/winbindd_util.c
+index f0344b1..d707173 100644
+--- source3/winbindd/winbindd_util.c
++++ source3/winbindd/winbindd_util.c
+@@ -1103,10 +1103,11 @@ bool parse_domain_user(const char *domuser, fstring
domain, fstring user)
+
+ if ( !p ) {
+ fstrcpy(user, domuser);
++ p = strchr(domuser, '@');
+
+- if ( assume_domain(lp_workgroup())) {
++ if ( assume_domain(lp_workgroup()) && p == NULL) {
+ fstrcpy(domain, lp_workgroup());
+- } else if ((p = strchr(domuser, '@')) != NULL) {
++ } else if (p != NULL) {
+ fstrcpy(domain, p + 1);
+ user[PTR_DIFF(p, domuser)] = 0;
+ } else {
+--
+2.1.4
+
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
2016-04-13 13:16:07.000000000 +0200
+++
new/patches/suse/0002-add-new-propagate-inheritance-option-for-smbcacls.patch
2016-10-06 21:06:45.000000000 +0200
@@ -154,7 +154,7 @@
if (!sd) return EXIT_PARSE_ERROR;
if (test_args) return EXIT_OK;
-@@ -606,6 +631,26 @@ static int cacl_set(struct cli_state *cli, const char
*filename,
+@@ -612,6 +637,26 @@ static int cacl_set(struct cli_state *cli, const char
*filename,
}
/*****************************************************
@@ -181,7 +181,7 @@
set the inherit on a file
*******************************************************/
static int inherit(struct cli_state *cli, const char *filename,
-@@ -774,6 +819,593 @@ static struct cli_state *connect_one(struct
user_auth_info *auth_info,
+@@ -780,6 +825,593 @@ static struct cli_state *connect_one(struct
user_auth_info *auth_info,
return c;
}
@@ -775,7 +775,7 @@
/****************************************************************************
main program
****************************************************************************/
-@@ -803,6 +1435,7 @@ int main(int argc, char *argv[])
+@@ -809,6 +1441,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"
-@@ -886,8 +1519,11 @@ int main(int argc, char *argv[])
+@@ -892,8 +1525,11 @@ int main(int argc, char *argv[])
break;
}
}
@@ -796,7 +796,7 @@
if(!poptPeekArg(pc)) {
poptPrintUsage(pc, stderr, 0);
return -1;
-@@ -929,6 +1565,7 @@ int main(int argc, char *argv[])
+@@ -935,6 +1571,7 @@ int main(int argc, char *argv[])
*share = 0;
share++;
@@ -804,7 +804,7 @@
if (!test_args) {
cli = connect_one(auth_info, server, share);
if (!cli) {
-@@ -955,7 +1592,20 @@ int main(int argc, char *argv[])
+@@ -961,7 +1598,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) {
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
2016-04-05 13:27:20.000000000 +0200
+++ new/patches/suse/0002-rpcclient-add-mgmt-command-support.patch
2016-10-06 21:06:45.000000000 +0200
@@ -137,7 +137,7 @@
index 9103b14..279248a 100755
--- source3/wscript_build
+++ source3/wscript_build
-@@ -1030,7 +1030,8 @@
+@@ -1019,7 +1019,8 @@
rpcclient/cmd_winreg.c
rpcclient/cmd_fss.c
rpcclient/cmd_witness.c
@@ -147,7 +147,7 @@
deps='''
talloc
popt_samba3
-@@ -1060,6 +1061,7 @@
+@@ -1049,6 +1050,7 @@
RPC_NDR_FSRVP
RPC_NDR_WITNESS
RPC_NDR_CLUSAPI
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/suse/HAVE_INCOHERENT_MMAP-s390.diff
new/patches/suse/HAVE_INCOHERENT_MMAP-s390.diff
--- old/patches/suse/HAVE_INCOHERENT_MMAP-s390.diff 2016-02-08
20:29:46.000000000 +0100
+++ new/patches/suse/HAVE_INCOHERENT_MMAP-s390.diff 2016-10-06
21:06:45.000000000 +0200
@@ -36,7 +36,7 @@
index a7384e8..5746abb 100644
--- lib/replace/wscript
+++ lib/replace/wscript
-@@ -532,6 +532,10 @@ removeea setea
+@@ -527,6 +527,10 @@ removeea setea
define='HAVE_INCOHERENT_MMAP',
msg="Checking for HAVE_INCOHERENT_MMAP")
++++++ samba-4.4.5.tar.gz -> samba-4.5.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/samba/samba-4.4.5.tar.gz
/work/SRC/openSUSE:Factory/.samba.new/samba-4.5.0.tar.gz differ: char 5, line 1
++++++ 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 2016-07-07 17:58:54.000000000 +0200
+++ new/vendor-files/tools/package-data 2016-10-07 01:35:41.000000000 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="3678"
+SAMBA_PACKAGE_SVN_VERSION="3712"
