[Pkg-samba-maint] [samba] 134/135: Merge tag 'upstream/4.1.4+dfsg'
Ivo De Decker
ivodd at moszumanska.debian.org
Sat Jan 11 21:30:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
ivodd pushed a commit to branch master
in repository samba.
commit 294cb8a92e937d5713f8c8af065dd45d2c57ea08
Merge: 76392bf 275afd1
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Sat Jan 11 21:54:30 2014 +0100
Merge tag 'upstream/4.1.4+dfsg'
Upstream version 4.1.4+dfsg
VERSION | 2 +-
WHATSNEW.txt | 106 ++-
docs-xml/build/DTD/samba.entities | 64 +-
docs-xml/manpages/dbwrap_tool.1.xml | 8 +-
docs-xml/manpages/idmap_ad.8.xml | 2 +-
docs-xml/manpages/idmap_autorid.8.xml | 2 +-
docs-xml/manpages/net.8.xml | 280 ++++++-
docs-xml/manpages/nmbd.8.xml | 36 +-
docs-xml/manpages/nmblookup.1.xml | 43 +-
docs-xml/manpages/ntlm_auth.1.xml | 42 +-
docs-xml/manpages/pdbedit.8.xml | 4 +-
docs-xml/manpages/profiles.1.xml | 10 +-
docs-xml/manpages/rpcclient.1.xml | 3 +-
docs-xml/manpages/samba-regedit.8.xml | 27 +-
docs-xml/manpages/samba.7.xml | 2 +-
docs-xml/manpages/samba.8.xml | 2 +-
docs-xml/manpages/sharesec.1.xml | 18 +-
docs-xml/manpages/smbcacls.1.xml | 46 +-
docs-xml/manpages/smbclient.1.xml | 20 +-
docs-xml/manpages/smbcontrol.1.xml | 14 +-
docs-xml/manpages/smbcquotas.1.xml | 32 +-
docs-xml/manpages/smbd.8.xml | 33 +-
docs-xml/manpages/smbget.1.xml | 9 +
docs-xml/manpages/smbpasswd.5.xml | 2 +-
docs-xml/manpages/smbstatus.1.xml | 20 +-
docs-xml/manpages/smbta-util.8.xml | 4 -
docs-xml/manpages/smbtree.1.xml | 2 +-
docs-xml/manpages/testparm.1.xml | 38 +-
docs-xml/manpages/vfs_cacheprime.8.xml | 2 +-
docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml | 2 +-
docs-xml/manpages/wbinfo.1.xml | 97 +++
docs-xml/manpages/winbindd.8.xml | 31 +-
docs-xml/smbdotconf/filename/manglingmethod.xml | 2 +-
.../smbdotconf/misc/directorynamecachesize.xml | 2 +-
.../smbdotconf/misc/fakedirectorycreatetimes.xml | 2 +-
docs-xml/smbdotconf/misc/rpcserver.xml | 2 +-
.../smbdotconf/protocol/aclallowexecutealways.xml | 2 +-
docs-xml/smbdotconf/protocol/ntaclsupport.xml | 2 +-
docs-xml/smbdotconf/security/aclgroupcontrol.xml | 2 +-
docs-xml/smbdotconf/security/smbencrypt.xml | 2 +-
docs-xml/smbdotconf/security/usernamemapscript.xml | 2 +-
docs-xml/smbdotconf/winbind/idmapconfig.xml | 2 +-
docs/manpages/dbwrap_tool.1 | 15 +-
docs/manpages/eventlogadm.8 | 4 +-
docs/manpages/findsmb.1 | 4 +-
docs/manpages/idmap_ad.8 | 6 +-
docs/manpages/idmap_autorid.8 | 6 +-
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 | 224 +++++-
docs/manpages/nmbd.8 | 28 +-
docs/manpages/nmblookup.1 | 31 +-
docs/manpages/ntlm_auth.1 | 53 +-
docs/manpages/pam_winbind.8 | 4 +-
docs/manpages/pam_winbind.conf.5 | 4 +-
docs/manpages/pdbedit.8 | 11 +-
docs/manpages/profiles.1 | 55 +-
docs/manpages/rpcclient.1 | 31 +-
docs/manpages/samba-regedit.8 | 50 +-
docs/manpages/samba-tool.8 | 4 +-
docs/manpages/samba.7 | 6 +-
docs/manpages/samba.8 | 9 +-
docs/manpages/sharesec.1 | 16 +-
docs/manpages/smb.conf.5 | 24 +-
docs/manpages/smbcacls.1 | 91 ++-
docs/manpages/smbclient.1 | 45 +-
docs/manpages/smbcontrol.1 | 57 +-
docs/manpages/smbcquotas.1 | 55 +-
docs/manpages/smbd.8 | 26 +-
docs/manpages/smbget.1 | 16 +-
docs/manpages/smbgetrc.5 | 4 +-
docs/manpages/smbpasswd.5 | 6 +-
docs/manpages/smbpasswd.8 | 4 +-
docs/manpages/smbspool.8 | 4 +-
docs/manpages/smbstatus.1 | 16 +-
docs/manpages/smbta-util.8 | 6 +-
docs/manpages/smbtar.1 | 4 +-
docs/manpages/smbtree.1 | 29 +-
docs/manpages/testparm.1 | 57 +-
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 | 6 +-
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 | 6 +-
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 | 71 +-
docs/manpages/winbind_krb5_locator.7 | 4 +-
docs/manpages/winbindd.8 | 28 +-
examples/perfcounter/perf_writer_disk.c | 8 +-
lib/ldb/common/attrib_handlers.c | 2 +-
lib/ntdb/man/ntdbtool.8.xml | 4 -
lib/util/samba_util.h | 4 +-
libcli/nbt/man/nmblookup4.1.xml | 2 +-
selftest/flapping | 1 -
selftest/knownfail | 1 +
selftest/target/Samba3.pm | 4 +
source3/include/printing.h | 1 +
source3/include/proto.h | 2 +
source3/lib/msg_channel.c | 100 +--
source3/lib/substitute.c | 43 +-
source3/lib/util.c | 42 +
source3/libnet/libnet_join.c | 17 +-
source3/libsmb/cli_smb2_fnum.c | 31 +-
source3/libsmb/cli_smb2_fnum.h | 1 +
source3/libsmb/clilist.c | 2 +-
source3/libsmb/libsmb_xattr.c | 6 +-
source3/modules/vfs_glusterfs.c | 52 +-
source3/passdb/passdb.c | 8 +-
source3/passdb/pdb_ldap.c | 24 +-
source3/printing/printing.c | 45 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 40 +-
source3/selftest/tests.py | 4 +
source3/smbd/aio.c | 4 +-
source3/smbd/dir.c | 28 +-
source3/smbd/filename.c | 10 +-
source3/smbd/globals.h | 31 +-
source3/smbd/nttrans.c | 6 +-
source3/smbd/open.c | 9 +-
source3/smbd/process.c | 5 +-
source3/smbd/proto.h | 1 -
source3/smbd/reply.c | 14 +-
source3/smbd/smb2_create.c | 3 +-
source3/smbd/smb2_lock.c | 2 +-
source3/smbd/smb2_read.c | 12 +-
source3/smbd/smb2_server.c | 886 ++++++++++-----------
source3/smbd/smbd.h | 2 +-
source3/torture/torture.c | 2 +-
source3/utils/net_sam.c | 2 +
source3/utils/sharesec.c | 6 +-
source3/utils/smbcacls.c | 6 +-
source3/winbindd/wb_fill_pwent.c | 73 +-
source3/winbindd/winbindd_cache.c | 13 +
source3/winbindd/winbindd_dual.c | 2 +-
source4/lib/registry/man/regdiff.1.xml | 3 -
source4/torture/basic/delaywrite.c | 95 +++
source4/torture/man/smbtorture.1.xml | 4 -
testsuite/nsswitch/getgrent_r.c | 2 +-
179 files changed, 2727 insertions(+), 1273 deletions(-)
--
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