[Pkg-samba-maint] [samba] 01/03: Merge tag 'debian/2%4.1.6+dfsg-1' into wheezy-backports
Ivo De Decker
ivodd at moszumanska.debian.org
Wed Mar 19 21:56:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
ivodd pushed a commit to branch wheezy-backports
in repository samba.
commit 2f824d92759f0fe0fc43a352740ce10d77b21abb
Merge: e35a9d3 9ce4ce5
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Wed Mar 19 21:26:06 2014 +0100
Merge tag 'debian/2%4.1.6+dfsg-1' into wheezy-backports
samba Debian release 2:4.1.6+dfsg-1
Conflicts:
debian/changelog
VERSION | 2 +-
WHATSNEW.txt | 70 +++++++-
debian/changelog | 9 +
debian/patches/readline63.patch | 35 ++++
debian/patches/series | 1 +
docs/manpages/dbwrap_tool.1 | 4 +-
docs/manpages/eventlogadm.8 | 4 +-
docs/manpages/findsmb.1 | 4 +-
docs/manpages/idmap_ad.8 | 4 +-
docs/manpages/idmap_autorid.8 | 4 +-
docs/manpages/idmap_hash.8 | 4 +-
docs/manpages/idmap_ldap.8 | 4 +-
docs/manpages/idmap_nss.8 | 4 +-
docs/manpages/idmap_rfc2307.8 | 4 +-
docs/manpages/idmap_rid.8 | 4 +-
docs/manpages/idmap_tdb.8 | 4 +-
docs/manpages/idmap_tdb2.8 | 4 +-
docs/manpages/libsmbclient.7 | 4 +-
docs/manpages/lmhosts.5 | 4 +-
docs/manpages/log2pcap.1 | 4 +-
docs/manpages/net.8 | 4 +-
docs/manpages/nmbd.8 | 4 +-
docs/manpages/nmblookup.1 | 4 +-
docs/manpages/ntlm_auth.1 | 4 +-
docs/manpages/pam_winbind.8 | 4 +-
docs/manpages/pam_winbind.conf.5 | 4 +-
docs/manpages/pdbedit.8 | 4 +-
docs/manpages/profiles.1 | 4 +-
docs/manpages/rpcclient.1 | 4 +-
docs/manpages/samba-regedit.8 | 4 +-
docs/manpages/samba-tool.8 | 4 +-
docs/manpages/samba.7 | 4 +-
docs/manpages/samba.8 | 4 +-
docs/manpages/sharesec.1 | 4 +-
docs/manpages/smb.conf.5 | 4 +-
docs/manpages/smbcacls.1 | 4 +-
docs/manpages/smbclient.1 | 4 +-
docs/manpages/smbcontrol.1 | 4 +-
docs/manpages/smbcquotas.1 | 4 +-
docs/manpages/smbd.8 | 4 +-
docs/manpages/smbget.1 | 4 +-
docs/manpages/smbgetrc.5 | 4 +-
docs/manpages/smbpasswd.5 | 4 +-
docs/manpages/smbpasswd.8 | 4 +-
docs/manpages/smbspool.8 | 4 +-
docs/manpages/smbstatus.1 | 4 +-
docs/manpages/smbta-util.8 | 4 +-
docs/manpages/smbtar.1 | 4 +-
docs/manpages/smbtree.1 | 4 +-
docs/manpages/testparm.1 | 4 +-
docs/manpages/vfs_acl_tdb.8 | 4 +-
docs/manpages/vfs_acl_xattr.8 | 4 +-
docs/manpages/vfs_aio_fork.8 | 4 +-
docs/manpages/vfs_aio_linux.8 | 4 +-
docs/manpages/vfs_aio_pthread.8 | 4 +-
docs/manpages/vfs_audit.8 | 4 +-
docs/manpages/vfs_btrfs.8 | 4 +-
docs/manpages/vfs_cacheprime.8 | 4 +-
docs/manpages/vfs_cap.8 | 4 +-
docs/manpages/vfs_catia.8 | 4 +-
docs/manpages/vfs_commit.8 | 4 +-
docs/manpages/vfs_crossrename.8 | 4 +-
docs/manpages/vfs_default_quota.8 | 4 +-
docs/manpages/vfs_dirsort.8 | 4 +-
docs/manpages/vfs_extd_audit.8 | 4 +-
docs/manpages/vfs_fake_perms.8 | 4 +-
docs/manpages/vfs_fileid.8 | 4 +-
docs/manpages/vfs_full_audit.8 | 4 +-
docs/manpages/vfs_gpfs.8 | 4 +-
docs/manpages/vfs_linux_xfs_sgid.8 | 4 +-
docs/manpages/vfs_media_harmony.8 | 4 +-
docs/manpages/vfs_netatalk.8 | 4 +-
docs/manpages/vfs_notify_fam.8 | 4 +-
docs/manpages/vfs_prealloc.8 | 4 +-
docs/manpages/vfs_preopen.8 | 4 +-
docs/manpages/vfs_readahead.8 | 4 +-
docs/manpages/vfs_readonly.8 | 4 +-
docs/manpages/vfs_recycle.8 | 4 +-
docs/manpages/vfs_scannedonly.8 | 4 +-
docs/manpages/vfs_shadow_copy.8 | 4 +-
docs/manpages/vfs_shadow_copy2.8 | 4 +-
docs/manpages/vfs_smb_traffic_analyzer.8 | 4 +-
docs/manpages/vfs_streams_depot.8 | 4 +-
docs/manpages/vfs_streams_xattr.8 | 4 +-
docs/manpages/vfs_syncops.8 | 4 +-
docs/manpages/vfs_time_audit.8 | 4 +-
docs/manpages/vfs_tsmsm.8 | 4 +-
docs/manpages/vfs_xattr_tdb.8 | 4 +-
docs/manpages/vfs_zfsacl.8 | 4 +-
docs/manpages/vfstest.1 | 4 +-
docs/manpages/wbinfo.1 | 4 +-
docs/manpages/winbind_krb5_locator.7 | 4 +-
docs/manpages/winbindd.8 | 4 +-
source3/auth/check_samsec.c | 1 +
source3/rpc_server/samr/srv_samr_chgpasswd.c | 55 ++++++
source3/rpc_server/samr/srv_samr_nt.c | 111 +-----------
source3/smbd/lanman.c | 254 ---------------------------
source3/utils/smbcacls.c | 2 +-
source4/rpc_server/samr/samr_password.c | 214 +++++-----------------
source4/torture/rpc/samr.c | 6 +
100 files changed, 402 insertions(+), 710 deletions(-)
diff --cc debian/changelog
index 78035c6,482cde3..bda14d9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
+ samba (2:4.1.6+dfsg-1) unstable; urgency=high
+
+ * New upstream security release. Fixes:
+ - CVE-2013-4496: password lockout not enforced for SAMR password changes
+ - CVE-2013-6442: smbcacls can remove a file or directory ACL by mistake
+ * Backport fix for readline 6.3 from master
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sat, 15 Mar 2014 12:13:59 +0100
+
+samba (2:4.1.5+dfsg-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+ * Replace dependency on newer Heimdal HDB API with dependency
+ on libhdb9-heimdal before the API change.
+ * Revert build-dep on the newer ctdb version.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sat, 01 Mar 2014 17:10:19 +0100
+
samba (2:4.1.5+dfsg-1) unstable; urgency=medium
[ Jelmer Vernooij ]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list