[Pkg-samba-maint] [samba] 01/05: Merge tag 'debian/4.1.11+dfsg-1' into wheezy-backports
Ivo De Decker
ivodd at moszumanska.debian.org
Wed Aug 20 22:05:07 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 b69f22abc3e3d01667578f5bc96a3a7dbe9ccd62
Merge: 5ec4bb4 0b6bf2a
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Wed Aug 20 20:25:00 2014 +0200
Merge tag 'debian/4.1.11+dfsg-1' into wheezy-backports
Conflicts:
debian/changelog
VERSION | 2 +-
WHATSNEW.txt | 200 +-
auth/credentials/credentials_krb5.c | 2 +-
debian/changelog | 27 +
debian/control | 7 +-
debian/po/pt_BR.po | 80 +-
debian/samba-dsdb-modules.install | 1 -
debian/samba-libs.install | 2 +-
debian/samba.smbd.upstart | 4 -
debian/source/lintian-overrides | 5 -
docs-xml/manpages/net.8.xml | 2 +
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 | 6 +-
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 +-
lib/ldb-samba/ldif_handlers.c | 7 +-
lib/ldb/ABI/ldb-1.1.17.sigs | 262 +
lib/ldb/ABI/pyldb-util-1.1.17.sigs | 2 +
lib/ldb/common/ldb.c | 25 +-
lib/ldb/common/ldb_dn.c | 4 +-
lib/ldb/common/ldb_modules.c | 52 +-
lib/ldb/ldb_map/ldb_map.c | 16 +-
lib/ldb/ldb_map/ldb_map.h | 3 +-
lib/ldb/ldb_map/ldb_map_inbound.c | 21 +-
lib/ldb/ldb_map/ldb_map_outbound.c | 64 +-
lib/ldb/ldb_map/ldb_map_private.h | 2 +-
lib/ldb/ldb_tdb/ldb_tdb.c | 7 +-
lib/ldb/modules/rdn_name.c | 10 +-
lib/ldb/modules/sort.c | 2 +-
lib/ldb/pyldb.c | 124 +-
lib/ldb/tools/ldbtest.c | 4 +
lib/ldb/wscript | 12 +-
lib/util/string_wrappers.h | 2 +-
libcli/security/access_check.c | 12 +-
libcli/smb/smb2_create_blob.h | 2 +-
libcli/smb/smb2cli_create.c | 6 +-
libcli/smb/smbXcli_base.h | 6 +-
nsswitch/libwbclient/wbc_pam.c | 30 +-
python/samba/dbchecker.py | 222 +-
python/samba/netcmd/domain.py | 5 +-
python/samba/provision/__init__.py | 61 +-
python/samba/provision/sambadns.py | 5 +-
python/samba/tests/samba3sam.py | 12 +-
script/autobuild.py | 4 +-
selftest/knownfail | 1 +
selftest/selftest.pl | 25 +-
selftest/subunithelper.py | 25 +-
selftest/tests.py | 1 +
source3/client/client.c | 10 +-
source3/lib/msg_channel.c | 12 +
source3/libsmb/cli_np_tstream.c | 2 +-
source3/libsmb/cli_smb2_fnum.c | 4 +-
source3/libsmb/cli_smb2_fnum.h | 2 +-
source3/libsmb/clifile.c | 73 +-
source3/libsmb/cliquota.c | 2 +-
source3/libsmb/clisymlink.c | 4 +-
source3/libsmb/libsmb_context.c | 17 +
source3/libsmb/libsmb_setget.c | 17 +-
source3/libsmb/libsmb_xattr.c | 6 +-
source3/libsmb/proto.h | 14 +-
source3/libsmb/pylibsmb.c | 2 +-
source3/locking/brlock.c | 2 +-
source3/locking/share_mode_lock.c | 1 +
source3/modules/nfs4_acls.c | 3 +-
source3/pam_smbpass/pam_smb_acct.c | 9 +
source3/pam_smbpass/pam_smb_auth.c | 7 +
source3/pam_smbpass/pam_smb_passwd.c | 16 +-
source3/passdb/machine_account_secrets.c | 10 +-
source3/passdb/pdb_samba_dsdb.c | 77 +-
source3/printing/printing_db.c | 4 +-
source3/smbd/blocking.c | 195 +-
source3/smbd/open.c | 22 +-
source3/smbd/pysmbd.c | 58 +-
source3/smbd/server.c | 16 +-
source3/smbd/smb2_create.c | 9 +-
source3/smbd/smb2_lock.c | 69 +-
source3/smbd/smb2_read.c | 69 +-
source3/torture/nbench.c | 2 +-
source3/torture/nbio.c | 2 +-
source3/torture/test_chain3.c | 2 +-
source3/torture/test_cleanup.c | 14 +-
source3/torture/test_notify.c | 6 +-
source3/torture/test_notify_online.c | 4 +-
source3/torture/test_nttrans_create.c | 4 +-
source3/torture/test_nttrans_fsctl.c | 2 +-
source3/torture/test_posix_append.c | 2 +-
source3/torture/torture.c | 127 +-
source3/torture/utable.c | 2 +-
source3/utils/net_rpc.c | 3 +-
source3/utils/net_rpc_printer.c | 7 +-
source3/utils/smbcacls.c | 6 +-
source3/winbindd/winbindd_cache.c | 4 +-
source3/winbindd/winbindd_rpc.c | 6 +-
source4/auth/gensec/gensec_gssapi.c | 1 -
source4/auth/kerberos/krb5_init_context.c | 12 -
source4/auth/kerberos/krb5_init_context.h | 2 +-
source4/cldap_server/cldap_server.c | 8 +-
source4/dns_server/dlz_bind9.c | 2 +-
source4/dns_server/dns_server.c | 9 +-
source4/dsdb/common/tests/dsdb_dn.c | 14 +
source4/dsdb/common/util.c | 59 +-
source4/dsdb/kcc/kcc_deleted.c | 2 +-
source4/dsdb/repl/drepl_out_helpers.c | 52 +-
source4/dsdb/repl/replicated_objects.c | 14 +-
source4/dsdb/samdb/cracknames.c | 38 +-
source4/dsdb/samdb/ldb_modules/descriptor.c | 2 +-
source4/dsdb/samdb/ldb_modules/dirsync.c | 7 +-
source4/dsdb/samdb/ldb_modules/extended_dn_in.c | 37 +-
source4/dsdb/samdb/ldb_modules/instancetype.c | 3 +-
source4/dsdb/samdb/ldb_modules/objectclass.c | 54 +-
source4/dsdb/samdb/ldb_modules/operational.c | 2 +-
.../dsdb/samdb/ldb_modules/partition_metadata.c | 34 +-
source4/dsdb/samdb/ldb_modules/password_hash.c | 1 -
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 267 +-
source4/dsdb/samdb/ldb_modules/rootdse.c | 110 +-
source4/dsdb/samdb/ldb_modules/samldb.c | 29 +-
source4/dsdb/samdb/ldb_modules/schema_data.c | 16 +-
source4/dsdb/samdb/ldb_modules/schema_load.c | 207 +-
source4/dsdb/samdb/ldb_modules/secrets_tdb_sync.c | 6 +-
source4/dsdb/samdb/ldb_modules/simple_ldap_map.c | 2 +-
source4/dsdb/samdb/ldb_modules/update_keytab.c | 11 +-
source4/dsdb/samdb/ldb_modules/util.c | 13 +
source4/dsdb/samdb/samdb.c | 7 -
source4/dsdb/samdb/samdb.h | 1 +
source4/dsdb/schema/schema.h | 10 +-
source4/dsdb/schema/schema_init.c | 10 -
source4/dsdb/schema/schema_set.c | 98 +-
source4/dsdb/schema/schema_syntax.c | 11 +
source4/dsdb/tests/python/acl.py | 26 +
source4/dsdb/tests/python/ldap.py | 27 +-
source4/dsdb/tests/python/sam.py | 37 +-
source4/kdc/kdc.c | 14 +-
source4/ldap_server/ldap_server.c | 8 +-
source4/libnet/libnet_export_keytab.c | 2 +-
source4/libnet/libnet_vampire.c | 5 -
source4/rpc_server/dcerpc_server.c | 8 +-
source4/rpc_server/drsuapi/drsutil.c | 2 +-
source4/rpc_server/lsa/dcesrv_lsa.c | 1 -
source4/rpc_server/samr/dcesrv_samr.c | 17 +-
source4/selftest/provisions/dump.sh | 48 -
.../release-4-1-0rc3/etc/smb.conf.template | 17 -
.../provisions/release-4-1-0rc3/private/dns.keytab | Bin 1037 -> 0 bytes
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 29028 ------------
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 43468 ------------------
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 928 -
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 488 -
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 12 -
.../private/dns/sam.ldb.d/metadata.tdb.dump | 8 -
.../release-4-1-0rc3/private/dns/sam.ldb.dump | 36 -
.../release-4-1-0rc3/private/dns_update_list | 39 -
.../release-4-1-0rc3/private/hklm.ldb.dump | 80 -
.../release-4-1-0rc3/private/idmap.ldb.dump | 48 -
.../provisions/release-4-1-0rc3/private/named.conf | 18 -
.../release-4-1-0rc3/private/named.conf.update | 7 -
.../provisions/release-4-1-0rc3/private/named.txt | 45 -
.../release-4-1-0rc3/private/privilege.ldb.dump | 156 -
.../release-4-1-0rc3/private/randseed.tdb.dump | 0
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 29104 ------------
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 43812 -------------------
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 928 -
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 488 -
...DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb.dump | 6600 ---
.../private/sam.ldb.d/metadata.tdb.dump | 8 -
.../release-4-1-0rc3/private/sam.ldb.dump | 36 -
.../private/schannel_store.tdb.dump | 0
.../release-4-1-0rc3/private/secrets.keytab | Bin 1482 -> 0 bytes
.../release-4-1-0rc3/private/secrets.ldb.dump | 48 -
.../release-4-1-0rc3/private/secrets.tdb.dump | 16 -
.../release-4-1-0rc3/private/share.ldb.dump | 32 -
.../private/smbd.tmp/msg/names.tdb.dump | 52 -
.../release-4-1-0rc3/private/spn_update_list | 30 -
.../release-4-1-0rc3/private/wins_config.ldb.dump | 4 -
source4/selftest/provisions/undump.sh | 37 -
source4/torture/auth/pac.c | 3 +-
source4/torture/raw/lock.c | 97 +
source4/utils/oLschema2ldif.c | 1 -
source4/utils/wscript_build | 2 +-
testdata/samba3/samba3.ldif | 4 +-
testprogs/blackbox/dbcheck-oldrelease.sh | 158 +-
testprogs/blackbox/dbcheck.sh | 5 +
wscript | 2 +-
265 files changed, 3111 insertions(+), 156727 deletions(-)
diff --cc debian/changelog
index c9ac709,686b4d9..00e9bf2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,30 +1,36 @@@
+ samba (2:4.1.11+dfsg-1) unstable; urgency=high
+
+ * New upstream release. Fixes:
+ + CVE-2014-3560: Remote code execution in nmbd. Closes: #756759
+
+ -- Jelmer Vernooij <jelmer at debian.org> Sun, 03 Aug 2014 03:47:07 +0200
+
+ samba (2:4.1.9+dfsg-2) unstable; urgency=medium
+
+ [ Jelmer Vernooij ]
+ * Depend on libgnutls28-dev rather than libgnutls-dev. Closes: #753146
+ * Remove outdated-autotools-helper-file overrides for config.guess and
+ config.sub; files are no longer present upstream.
+ * Add branch to Vcs-Git header.
+ * samba.smbd.upstart: Remove leftover code for RUN_MODE=inetd, which
+ was already removed elsewhere.
+ * Move dsdb-module library from samba-dsdb-modules to samba-libs, to
+ prevent circular dependencies between samba-dsdb-modules and samba-
+ libs. This is necessary since dsdb-module is now used by the dcerpc-
+ server library.
+
+ [ Debconf translations ]
+ * New Brazilian Portugese translation from Adriano Rafael Gomes.
+ Closes: #752719
+
+ -- Jelmer Vernooij <jelmer at debian.org> Sun, 29 Jun 2014 19:43:52 +0200
+
+samba (2:4.1.9+dfsg-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Mon, 23 Jun 2014 19:53:08 +0200
+
samba (2:4.1.9+dfsg-1) unstable; urgency=high
* New upstream security release. Fixes:
diff --cc debian/control
index 37f5693,79d7ac4..e3cc43d
--- a/debian/control
+++ b/debian/control
@@@ -22,9 -26,9 +22,9 @@@ Build-Depends: bison
libblkid-dev,
libbsd-dev,
libcap-dev [linux-any],
- libctdb-dev (>= 2),
+ libctdb-dev (>= 1.10+git20110412),
libcups2-dev,
- libgnutls-dev,
+ libgnutls28-dev,
libheimntlm0-heimdal (>= 1.6~),
libldap2-dev,
libldb-dev (>= 1:1.1.16~),
--
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