Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked in at 2012-02-15 16:17:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba", Maintainer is "samba-maintainers@SuSE.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2012-02-01 13:17:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2012-02-15 16:17:55.000000000 +0100
@@ -1,0 +2,56 @@
+Mon Feb 6 13:39:48 UTC 2012 - lmuelle@suse.de
+
+- s3:winbindd fix a return code check; (bso#8406).
+
+-------------------------------------------------------------------
+Mon Feb 6 13:36:38 UTC 2012 - lmuelle@suse.de
+
+- s3: Add rmdir operation to streams_depot; (bso#8733).
+
+-------------------------------------------------------------------
+Mon Feb 6 13:34:09 UTC 2012 - lmuelle@suse.de
+
+- s3:smbd:smb2: fix an assignment-instead-of-check bug conn_snum_used();
+ (bso#8738).
+
+-------------------------------------------------------------------
+Mon Feb 6 13:30:53 UTC 2012 - lmuelle@suse.de
+
+- s3:auth: fill the sids array of the info3 in
+ wbcAuthUserInfo_to_netr_SamInfo3(); (bso#8739).
+
+-------------------------------------------------------------------
+Mon Feb 6 13:26:26 UTC 2012 - lmuelle@suse.de
+
+- s3:client: ignore SMBecho errors (the server may not support it);
+ (bso#8139).
+
+-------------------------------------------------------------------
+Mon Feb 6 13:14:05 UTC 2012 - lmuelle@suse.de
+
+- Be more strict when using PAM_AUTH API from winbind if Kerberos auth is
+ enabled and don't unintentionally use a bogus domain name; (bso#8734).
+
+-------------------------------------------------------------------
+Mon Feb 6 13:07:57 UTC 2012 - lmuelle@suse.de
+
+- smbclient fails with posix large reads; (bso#8727).
+
+-------------------------------------------------------------------
+Thu Feb 2 20:27:25 UTC 2012 - lmuelle@suse.de
+
+- Use the smbfs init script on versions pre-11.3, or cifs in later versions;
+ (bnc#744614).
+
+-------------------------------------------------------------------
+Mon Jan 30 15:03:43 UTC 2012 - lmuelle@suse.de
+
+- s3: Compile IDL files in autogen, some configure tests need this.
+
+-------------------------------------------------------------------
+Mon Jan 30 15:46:17 CET 2012 - fcrozat@suse.com
+
+- Fixes various deadlocks in if-up.d / if-down.d when running under
+ systemd; (bnc#732395).
+
+-------------------------------------------------------------------
@@ -111,0 +168,6 @@
+
+-------------------------------------------------------------------
+Tue Jan 24 10:58:38 CET 2012 - ddiss@suse.de
+
+- Fix incorrect types in the full_audit VFS module. Add null terminators to
+ audit log enums; (bnc#742885).
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.hJ3A0T/_old 2012-02-15 16:17:57.000000000 +0100
+++ /var/tmp/diff_new_pack.hJ3A0T/_new 2012-02-15 16:17:57.000000000 +0100
@@ -437,7 +437,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%changelog
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.hJ3A0T/_old 2012-02-15 16:17:57.000000000 +0100
+++ /var/tmp/diff_new_pack.hJ3A0T/_new 2012-02-15 16:17:57.000000000 +0100
@@ -208,7 +208,7 @@
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package client
@@ -252,7 +252,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -278,7 +278,7 @@
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%endif
@@ -308,7 +308,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%endif
@@ -335,7 +335,7 @@
--------
Jeremy Allison <jra at samba dot org>
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%if %{make_utils}
@@ -356,7 +356,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%endif
@@ -391,7 +391,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -417,14 +417,14 @@
%description -n libsmbclient
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%else
%description -n libsmbclient0
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%endif
@@ -472,7 +472,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libnetapi0
@@ -490,7 +490,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libnetapi-devel
@@ -514,7 +514,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -535,14 +535,14 @@
%description -n libsmbsharemodes
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%else
%description -n libsmbsharemodes0
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%endif
@@ -578,7 +578,7 @@
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libwbclient0
@@ -596,7 +596,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libwbclient-devel
@@ -620,7 +620,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libtalloc2
@@ -640,7 +640,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libtalloc-devel
@@ -666,7 +666,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libtdb1
@@ -686,7 +686,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libtdb-devel
@@ -708,7 +708,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libtevent0
@@ -728,7 +728,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libtevent-devel
@@ -756,7 +756,7 @@
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libldb1
@@ -778,7 +778,7 @@
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%package -n libldb-devel
@@ -805,7 +805,7 @@
--------
The Samba Team
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%if %{make_ldapsmb}
@@ -828,7 +828,7 @@
--------
Guenther Deschner <guenther at deschner dot de>
-Source Timestamp: 2740
+Source Timestamp: 2757
Branch : trunk
%endif
@@ -1363,7 +1363,7 @@
if [ ${1:-0} -eq 1 ]; then
# Only insserv cifs if we're not in update mode.
%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131
-%{?insserv_force_if_yast:%{insserv_force_if_yast cifs}}
+%{?insserv_force_if_yast:%{insserv_force_if_yast %{cifs_init_script}}}
%endif
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba
++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.hJ3A0T/_old 2012-02-15 16:17:57.000000000 +0100
+++ /var/tmp/diff_new_pack.hJ3A0T/_new 2012-02-15 16:17:57.000000000 +0100
@@ -1,2 +1,2 @@
-2740
+2757
Branch : trunk
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/15a423bf373a8116a0de7a627eaaea3932541e88 new/patches/samba.org/15a423bf373a8116a0de7a627eaaea3932541e88
--- old/patches/samba.org/15a423bf373a8116a0de7a627eaaea3932541e88 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/15a423bf373a8116a0de7a627eaaea3932541e88 2012-02-06 14:34:47.000000000 +0100
@@ -0,0 +1,27 @@
+commit 15a423bf373a8116a0de7a627eaaea3932541e88
+Author: Michael Adam
+Date: Wed Feb 1 14:25:12 2012 +0000
+
+ s3:smbd:smb2: fix an assignment-instead-of-check bug conn_snum_used()
+
+ Accidential "=" instead of "==".
+
+ Autobuild-User: Michael Adam
+ Autobuild-Date: Wed Feb 1 17:10:15 CET 2012 on sn-devel-104
+ (cherry picked from commit 6ba09e039e4efee33ce6b8cd9f919409656c2afb)
+
+ Fix bug #8738 (SMB2 server will not release unused shares).
+
+Index: source3/smbd/conn.c
+===================================================================
+--- source3/smbd/conn.c.orig
++++ source3/smbd/conn.c
+@@ -67,7 +67,7 @@ bool conn_snum_used(int snum)
+ for (ptcon = sess->tcons.list; ptcon; ptcon = ptcon->next) {
+ if (ptcon->compat_conn &&
+ ptcon->compat_conn->params &&
+- (ptcon->compat_conn->params->service = snum)) {
++ (ptcon->compat_conn->params->service == snum)) {
+ return true;
+ }
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/4e9091a65a9a19511763a09ae6a48ec05fb156d6 new/patches/samba.org/4e9091a65a9a19511763a09ae6a48ec05fb156d6
--- old/patches/samba.org/4e9091a65a9a19511763a09ae6a48ec05fb156d6 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/4e9091a65a9a19511763a09ae6a48ec05fb156d6 2012-02-06 14:31:44.000000000 +0100
@@ -0,0 +1,44 @@
+commit 4e9091a65a9a19511763a09ae6a48ec05fb156d6
+Author: Stefan Metzmacher
+Date: Wed Feb 1 17:02:52 2012 +0100
+
+ s3:auth: fix potential gap creation in wbcsids_to_samr_RidWithAttributeArray()
+
+ Pair-Programmed-With: Michael Adam
+
+ metze
+ (cherry picked from commit adbab7710d1fc4ca31469982dae0ee51e6b19896)
+
+Index: source3/auth/server_info.c
+===================================================================
+--- source3/auth/server_info.c.orig
++++ source3/auth/server_info.c
+@@ -529,7 +529,7 @@ static NTSTATUS wbcsids_to_samr_RidWithA
+ const struct wbcSidWithAttr *sids,
+ size_t num_sids)
+ {
+- unsigned int i;
++ unsigned int i, j = 0;
+ bool ok;
+
+ groups->rids = talloc_array(mem_ctx,
+@@ -542,15 +542,16 @@ static NTSTATUS wbcsids_to_samr_RidWithA
+ for (i = 0; i < num_sids; i++) {
+ ok = sid_peek_check_rid(domain_sid,
+ (const struct dom_sid *)&sids[i].sid,
+- &groups->rids[i].rid);
++ &groups->rids[j].rid);
+ if (!ok) continue;
+
+- groups->rids[i].attributes = SE_GROUP_MANDATORY |
++ groups->rids[j].attributes = SE_GROUP_MANDATORY |
+ SE_GROUP_ENABLED_BY_DEFAULT |
+ SE_GROUP_ENABLED;
+- groups->count++;
++ j++;
+ }
+
++ groups->count = j;
+ return NT_STATUS_OK;
+ }
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/53109bfa351da21b07ad99fa9b2a26d7c87bfa44 new/patches/samba.org/53109bfa351da21b07ad99fa9b2a26d7c87bfa44
--- old/patches/samba.org/53109bfa351da21b07ad99fa9b2a26d7c87bfa44 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/53109bfa351da21b07ad99fa9b2a26d7c87bfa44 2012-02-06 14:31:44.000000000 +0100
@@ -0,0 +1,87 @@
+commit 53109bfa351da21b07ad99fa9b2a26d7c87bfa44
+Author: Stefan Metzmacher
+Date: Wed Feb 1 17:04:17 2012 +0100
+
+ s3:auth: fill the sids array of the info3 in wbcAuthUserInfo_to_netr_SamInfo3() (bug #8739)
+
+ Originally, only the rid array was filled and foreign domain sids were omitted.
+
+ Pair-Programmed-With: Michael Adam
+
+ metze
+
+ Autobuild-User: Stefan Metzmacher
+ Autobuild-Date: Thu Feb 2 12:59:32 CET 2012 on sn-devel-104
+ (cherry picked from commit dab7b0e7171edf5b11af154175711e2b972c000b)
+
+Index: source3/auth/server_info.c
+===================================================================
+--- source3/auth/server_info.c.orig
++++ source3/auth/server_info.c
+@@ -555,6 +555,48 @@ static NTSTATUS wbcsids_to_samr_RidWithA
+ return NT_STATUS_OK;
+ }
+
++static NTSTATUS wbcsids_to_netr_SidAttrArray(
++ const struct dom_sid *domain_sid,
++ const struct wbcSidWithAttr *sids,
++ size_t num_sids,
++ TALLOC_CTX *mem_ctx,
++ struct netr_SidAttr **_info3_sids,
++ uint32_t *info3_num_sids)
++{
++ unsigned int i, j = 0;
++ struct netr_SidAttr *info3_sids;
++
++ info3_sids = talloc_array(mem_ctx, struct netr_SidAttr, num_sids);
++ if (info3_sids == NULL) {
++ return NT_STATUS_NO_MEMORY;
++ }
++
++ /* a wbcDomainSid is the same as a dom_sid */
++ for (i = 0; i < num_sids; i++) {
++ const struct dom_sid *sid;
++
++ sid = (const struct dom_sid *)&sids[i].sid;
++
++ if (dom_sid_in_domain(domain_sid, sid)) {
++ continue;
++ }
++
++ info3_sids[j].sid = dom_sid_dup(info3_sids, sid);
++ if (info3_sids[j].sid == NULL) {
++ talloc_free(info3_sids);
++ return NT_STATUS_NO_MEMORY;
++ }
++ info3_sids[j].attributes = SE_GROUP_MANDATORY |
++ SE_GROUP_ENABLED_BY_DEFAULT |
++ SE_GROUP_ENABLED;
++ j++;
++ }
++
++ *info3_num_sids = j;
++ *_info3_sids = info3_sids;
++ return NT_STATUS_OK;
++}
++
+ struct netr_SamInfo3 *wbcAuthUserInfo_to_netr_SamInfo3(TALLOC_CTX *mem_ctx,
+ const struct wbcAuthUserInfo *info)
+ {
+@@ -635,6 +677,17 @@ struct netr_SamInfo3 *wbcAuthUserInfo_to
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(info3);
+ return NULL;
++ }
++
++ status = wbcsids_to_netr_SidAttrArray(&domain_sid,
++ &info->sids[1],
++ info->num_sids - 1,
++ info3,
++ &info3->sids,
++ &info3->sidcount);
++ if (!NT_STATUS_IS_OK(status)) {
++ TALLOC_FREE(info3);
++ return NULL;
+ }
+
+ info3->base.user_flags = info->user_flags;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/693533ba5b91d74925568f719bdee969c6637ba7 new/patches/samba.org/693533ba5b91d74925568f719bdee969c6637ba7
--- old/patches/samba.org/693533ba5b91d74925568f719bdee969c6637ba7 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/693533ba5b91d74925568f719bdee969c6637ba7 2012-02-06 14:38:10.000000000 +0100
@@ -0,0 +1,74 @@
+commit 693533ba5b91d74925568f719bdee969c6637ba7
+Author: Volker Lendecke
+Date: Tue Jan 31 22:26:35 2012 +0100
+
+ s3: Add rmdir operation to streams_depot
+
+ The last 2 patches address bug #8733 (streams_depot leaves streams around on
+ rmdir).
+
+Index: source3/modules/vfs_streams_depot.c
+===================================================================
+--- source3/modules/vfs_streams_depot.c.orig
++++ source3/modules/vfs_streams_depot.c
+@@ -657,6 +657,52 @@ static int streams_depot_unlink(vfs_hand
+ return ret;
+ }
+
++static int streams_depot_rmdir(vfs_handle_struct *handle, const char *path)
++{
++ struct smb_filename *smb_fname_base = NULL;
++ NTSTATUS status;
++ int ret = -1;
++
++ DEBUG(10, ("streams_depot_rmdir called for %s\n", path));
++
++ /*
++ * We potentially need to delete the per-inode streams directory
++ */
++
++ status = create_synthetic_smb_fname(talloc_tos(), path,
++ NULL, NULL, &smb_fname_base);
++ if (!NT_STATUS_IS_OK(status)) {
++ errno = map_errno_from_nt_status(status);
++ return -1;
++ }
++
++ if (lp_posix_pathnames()) {
++ ret = SMB_VFS_NEXT_LSTAT(handle, smb_fname_base);
++ } else {
++ ret = SMB_VFS_NEXT_STAT(handle, smb_fname_base);
++ }
++
++ if (ret == -1) {
++ TALLOC_FREE(smb_fname_base);
++ return -1;
++ }
++
++ if (smb_fname_base->st.st_ex_nlink == 2) {
++ char *dirname = stream_dir(handle, smb_fname_base,
++ &smb_fname_base->st, false);
++
++ if (dirname != NULL) {
++ SMB_VFS_NEXT_RMDIR(handle, dirname);
++ }
++ TALLOC_FREE(dirname);
++ }
++
++ ret = SMB_VFS_NEXT_RMDIR(handle, path);
++
++ TALLOC_FREE(smb_fname_base);
++ return ret;
++}
++
+ static int streams_depot_rename(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname_src,
+ const struct smb_filename *smb_fname_dst)
+@@ -868,6 +914,7 @@ static struct vfs_fn_pointers vfs_stream
+ .stat = streams_depot_stat,
+ .lstat = streams_depot_lstat,
+ .unlink = streams_depot_unlink,
++ .rmdir = streams_depot_rmdir,
+ .rename = streams_depot_rename,
+ .streaminfo = streams_depot_streaminfo,
+ };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0 new/patches/samba.org/9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0
--- old/patches/samba.org/9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0 2012-02-06 14:38:10.000000000 +0100
@@ -0,0 +1,28 @@
+commit 9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0
+Author: Volker Lendecke
+Date: Tue Jan 31 22:26:23 2012 +0100
+
+ s3: Delete streams on directories
+
+Index: source3/smbd/close.c
+===================================================================
+--- source3/smbd/close.c.orig
++++ source3/smbd/close.c
+@@ -1042,6 +1042,17 @@ static NTSTATUS close_directory(struct s
+
+ TALLOC_FREE(lck);
+
++ if ((fsp->conn->fs_capabilities & FILE_NAMED_STREAMS)
++ && !is_ntfs_stream_smb_fname(fsp->fsp_name)) {
++
++ status = delete_all_streams(fsp->conn, fsp->fsp_name->base_name);
++ if (!NT_STATUS_IS_OK(status)) {
++ DEBUG(5, ("delete_all_streams failed: %s\n",
++ nt_errstr(status)));
++ goto out;
++ }
++ }
++
+ status = rmdir_internals(talloc_tos(), fsp);
+
+ DEBUG(5,("close_directory: %s. Delete on close was set - "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/9d5ed16ddac1598918338a432e9effa8ab869300 new/patches/samba.org/9d5ed16ddac1598918338a432e9effa8ab869300
--- old/patches/samba.org/9d5ed16ddac1598918338a432e9effa8ab869300 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/9d5ed16ddac1598918338a432e9effa8ab869300 2012-02-06 14:41:26.000000000 +0100
@@ -0,0 +1,37 @@
+commit 9d5ed16ddac1598918338a432e9effa8ab869300
+Author: Christian Ambach
+Date: Wed Aug 24 16:21:37 2011 +0200
+
+ s3:winbindd fix a return code check
+
+ talloc_traverse_dict will return with -1 in case of an error and
+ might return positive values that indicate the count of found
+ entries
+
+ Autobuild-User: Christian Ambach
+ Autobuild-Date: Wed Aug 24 18:09:11 CEST 2011 on sn-devel-104
+
+ Fix bug #8406 (winbind might not return groupnames to getgrgid nss calls).
+
+Index: source3/winbindd/winbindd_group.c
+===================================================================
+--- source3/winbindd/winbindd_group.c.orig
++++ source3/winbindd/winbindd_group.c
+@@ -115,7 +115,7 @@ NTSTATUS winbindd_print_groupmembers(str
+ c.len = 0;
+
+ res = talloc_dict_traverse(members, getgr_calc_memberlen, &c);
+- if (res != 0) {
++ if (res == -1) {
+ DEBUG(5, ("talloc_dict_traverse failed\n"));
+ return NT_STATUS_INTERNAL_ERROR;
+ }
+@@ -128,7 +128,7 @@ NTSTATUS winbindd_print_groupmembers(str
+ }
+
+ res = talloc_dict_traverse(members, getgr_unparse_members, &m);
+- if (res != 0) {
++ if (res == -1) {
+ DEBUG(5, ("talloc_dict_traverse failed\n"));
+ TALLOC_FREE(m.buf);
+ return NT_STATUS_INTERNAL_ERROR;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a1ea9634fd07d1a949b9f772c36fcfb84c2f230f new/patches/samba.org/a1ea9634fd07d1a949b9f772c36fcfb84c2f230f
--- old/patches/samba.org/a1ea9634fd07d1a949b9f772c36fcfb84c2f230f 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/a1ea9634fd07d1a949b9f772c36fcfb84c2f230f 2012-02-06 14:18:19.000000000 +0100
@@ -0,0 +1,33 @@
+commit a1ea9634fd07d1a949b9f772c36fcfb84c2f230f
+Author: Matthieu Patou
+Date: Mon Jan 30 00:05:08 2012 -0800
+
+ s3-winbind: don't try to do clever thing if the username is not found while authenticating through winbind
+
+ This could cause that we authenticate a user with a bogus domain to
+ winbind's domain if the password supplied for the PAM_AUTH match.
+
+ The problem was reported by Jeff Venable (jvenable@juniper.net).
+ Patch from Andrew Bartlett (abartlett@samba.org).
+
+ Autobuild-User: Matthieu Patou
+ Autobuild-Date: Mon Jan 30 18:58:12 CET 2012 on sn-devel-104
+ (cherry picked from commit 56d5cb938651b9c67a8400d1adc61a23889a6a29)
+
+ Fix bug #8734 (When using PAM_AUTH API from winbind if Kerberos auth is enabled,
+ samba will authenticate user with a bogus domain).
+
+Index: source3/winbindd/winbindd_pam.c
+===================================================================
+--- source3/winbindd/winbindd_pam.c.orig
++++ source3/winbindd/winbindd_pam.c
+@@ -1078,7 +1078,8 @@ static NTSTATUS winbindd_dual_pam_auth_k
+ DEBUG(3, ("Authentication for domain for [%s] -> [%s]\\[%s] failed as %s is not a trusted domain\n",
+ state->request->data.auth.user, name_domain, name_user, name_domain));
+
+- contact_domain = find_our_domain();
++ result = NT_STATUS_NO_SUCH_USER;
++ goto done;
+ }
+ }
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6 new/patches/samba.org/bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6
--- old/patches/samba.org/bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6 2012-02-06 14:27:42.000000000 +0100
@@ -0,0 +1,27 @@
+commit bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6
+Author: Stefan Metzmacher
+Date: Tue Jan 31 10:02:18 2012 -0800
+
+ s3:client: ignore SMBecho errors (the server may not support it) (bug #8139) Signed-off-by: Jeremy Allison
+
+Index: source3/client/client.c
+===================================================================
+--- source3/client/client.c.orig
++++ source3/client/client.c
+@@ -4844,9 +4844,13 @@ static void readline_callback(void)
+ memset(garbage, 0xf0, sizeof(garbage));
+ status = cli_echo(cli, 1, data_blob_const(garbage, sizeof(garbage)));
+
+- if (!NT_STATUS_IS_OK(status)) {
+- DEBUG(0, ("SMBecho failed. Maybe server has closed "
+- "the connection\n"));
++ if (NT_STATUS_IS_OK(status)) {
++ return;
++ }
++
++ if (!cli_state_is_connected(cli)) {
++ DEBUG(0, ("SMBecho failed (%s). The connection is "
++ "disconnected now\n", nt_errstr(status)));
+ finished = true;
+ smb_readline_done();
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/e86ad41af9d50265cab7cfdabdacb40bb4d3acc0 new/patches/samba.org/e86ad41af9d50265cab7cfdabdacb40bb4d3acc0
--- old/patches/samba.org/e86ad41af9d50265cab7cfdabdacb40bb4d3acc0 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/e86ad41af9d50265cab7cfdabdacb40bb4d3acc0 2012-02-06 14:10:42.000000000 +0100
@@ -0,0 +1,27 @@
+commit e86ad41af9d50265cab7cfdabdacb40bb4d3acc0
+Author: Andrew Bartlett
+Date: Fri Jan 27 16:03:55 2012 -0800
+
+ Fix for bug #8727 - smbclient fails with posix large reads.
+
+ s3-libsmb Do not limit read replies to NBT packet sizes
+
+ With the posix extensions, we can read 16MB at a time, so we need to check
+ the full size of the packet, not the size rounded down to the old NBT
+ limit.
+
+ Signed-off-by: Jeremy Allison
+
+Index: source3/libsmb/clireadwrite.c
+===================================================================
+--- source3/libsmb/clireadwrite.c.orig
++++ source3/libsmb/clireadwrite.c
+@@ -215,7 +215,7 @@ static void cli_read_andx_done(struct te
+
+ state->buf = (uint8_t *)smb_base(inbuf) + SVAL(vwv+6, 0);
+
+- if (trans_oob(smb_len(inbuf), SVAL(vwv+6, 0), state->received)
++ if (trans_oob(smb_len_large(inbuf), SVAL(vwv+6, 0), state->received)
+ || ((state->received != 0) && (state->buf < bytes))) {
+ DEBUG(5, ("server returned invalid read&x data offset\n"));
+ tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2012-01-25 21:43:51.000000000 +0100
+++ new/patches/series 2012-02-06 14:39:41.000000000 +0100
@@ -6,6 +6,15 @@
# Samba patches from upstream, git.samba.org
samba.org/3eb26f3cf877cc279cb9218654d0d6c39897ded4 -p0 # bnc 713135
+samba.org/e86ad41af9d50265cab7cfdabdacb40bb4d3acc0 -p0 # bso 8727
+samba.org/a1ea9634fd07d1a949b9f772c36fcfb84c2f230f -p0 # bso 8734
+samba.org/bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6 -p0 # bso 8139
+samba.org/4e9091a65a9a19511763a09ae6a48ec05fb156d6 -p0 # bso 8739 1/2
+samba.org/53109bfa351da21b07ad99fa9b2a26d7c87bfa44 -p0 # bso 8739 2/2
+samba.org/15a423bf373a8116a0de7a627eaaea3932541e88 -p0 # bso 8738
+samba.org/9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0 -p0 # bso 8733 1/2
+samba.org/693533ba5b91d74925568f719bdee969c6637ba7 -p0 # bso 8733 2/2
+samba.org/9d5ed16ddac1598918338a432e9effa8ab869300 -p0 # bso 8406
# SuSE specific changes
# disabled -> WIP lmuelle
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/cifs new/vendor-files/tools/cifs
--- old/vendor-files/tools/cifs 2011-10-14 13:02:49.000000000 +0200
+++ new/vendor-files/tools/cifs 2012-02-09 13:42:10.000000000 +0100
@@ -51,6 +51,29 @@
exit 1
}
+systemd_running () {
+ # We simply test whether systemd cgroup hierarchy is mounted
+ # where we return 0, non-zero if not.
+ /bin/mountpoint -q /sys/fs/cgroup/systemd
+}
+systemd_booting () {
+ # returns 0 when we boot, 1 in running system
+ systemctl show -p ActiveState default.target | grep -qi inactive
+}
+in_systemd_service () {
+ # returns 1 when we are started from a systemd service, 1 if not
+ grep -q -E ':name=systemd:/system/' /proc/$$/cgroup
+}
+
+SD_RUNNING="no"
+SD_BOOTING="no"
+IN_SYSTEMD_SERVICE="no"
+if systemd_running; then
+ SD_RUNNING="yes"
+ systemd_booting && SD_BOOTING="yes"
+ in_systemd_service && IN_SYSTEMD_SERVICE="yes"
+fi
+
source /etc/rc.status
# Main case switch
@@ -60,23 +83,33 @@
state=`read_cached_config_data dhcp4_state "$interface"`
if rc_active nmb; then
- log_msg=$( rcnmb start 2>&1)
+ # let systemd start nmb directly on boot
+ if [ "${SD_RUNNING}" = "yes" -a "${SD_BOOTING}" != "yes" ]; then
+ log_msg=$( systemctl --ignore-dependencies start nmb.service 2>&1)
+ elif [ "${SD_RUNNING}" != "yes" ]; then
+ log_msg=$( rcnmb start 2>&1)
+ fi
log_dbg "${log_msg}"
fi
# Restart cifs only if IPaddress changes and cifs is active
if [ "$state" == "new" ] && rc_active cifs; then
- log_msg=$( rccifs restart 2>&1)
+ # prevent deadlock in systemd
+ if [ "${IN_SYSTEMD_SERVICE}" ]; then
+ log_msg=$( systemctl --ignore-dependencies restart cifs.service 2>&1)
+ else
+ log_msg=$( rccifs restart 2>&1)
+ fi
log_dbg "${log_msg}"
fi
;;
*if-down.d*)
- # prevent deadlock in systemd
- if grep -q -E ':name=systemd:/system/network-remotefs.service' /proc/$$/cgroup ; then
- exit 0
- fi
-
if rc_active cifs; then
- log_msg=$( rccifs stop 2>&1)
+ # prevent deadlock in systemd
+ if [ "${IN_SYSTEMD_SERVICE}" ]; then
+ log_msg=$( systemctl --ignore-dependencies stop cifs.service 2>&1)
+ else
+ log_msg=$( rccifs stop 2>&1)
+ fi
log_dbg "${log_msg}"
fi
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/dhcpcd-hook-samba new/vendor-files/tools/dhcpcd-hook-samba
--- old/vendor-files/tools/dhcpcd-hook-samba 2011-05-05 17:55:26.000000000 +0200
+++ new/vendor-files/tools/dhcpcd-hook-samba 2012-02-09 13:42:10.000000000 +0100
@@ -196,8 +196,14 @@
if test "${new_netbios_name_servers}" != "${old_netbios_name_servers}" -o \
"${new_netbios_scope}" != "${old_netbios_scope}"; then
servicesToReload="nmb winbind smb"
+ grep -q -E ':name=systemd:/system/' /proc/$$/cgroup 2>/dev/null
+ not_in_systemd=$?
for service in ${servicesToReload}; do
- test -x /etc/init.d/${service} && /etc/init.d/${service} force-reload
+ if ${not_in_systemd}; then
+ test -x /etc/init.d/${service} && /etc/init.d/${service} force-reload
+ else
+ systemctl --ignore-dependencies force-reload ${service}.service
+ fi
done
log_dbg "Got new settings. Services ${servicesToReload} reloaded."
fi
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 2012-01-29 22:16:26.000000000 +0100
+++ new/vendor-files/tools/package-data 2012-02-09 13:53:44.000000000 +0100
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2740"
+SAMBA_PACKAGE_SVN_VERSION="2757"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org