[Pkg-samba-maint] [samba] 02/06: Merge tag 'upstream/4.6.7+dfsg'

Mathieu Parent sathieu at moszumanska.debian.org
Wed Aug 16 17:50:22 UTC 2017


This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch master
in repository samba.

commit 7fb1f84c2d01949f013383b2168a50f6723ba046
Merge: e511bd2 2bea4ff
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Aug 15 21:59:24 2017 +0200

    Merge tag 'upstream/4.6.7+dfsg'
    
    Upstream version 4.6.7+dfsg

 VERSION                                           |    2 +-
 WHATSNEW.txt                                      |  143 +-
 auth/gensec/spnego.c                              |    6 +-
 auth/ntlmssp/ntlmssp_util.c                       |   21 +
 buildtools/wafsamba/samba_bundled.py              |   21 +-
 ctdb/common/pidfile.c                             |    8 +
 ctdb/config/events.d/60.nfs                       |    8 +-
 ctdb/config/functions                             |    2 +-
 ctdb/doc/ctdb-etcd.7                              |    6 +-
 ctdb/doc/ctdb-etcd.7.html                         |    4 +-
 ctdb/doc/ctdb-statistics.7                        |    6 +-
 ctdb/doc/ctdb-statistics.7.html                   |  134 +-
 ctdb/doc/ctdb-tunables.7                          |    9 +-
 ctdb/doc/ctdb-tunables.7.html                     |  108 +-
 ctdb/doc/ctdb.1                                   |    6 +-
 ctdb/doc/ctdb.1.html                              |  196 +--
 ctdb/doc/ctdb.7                                   |    6 +-
 ctdb/doc/ctdb.7.html                              |   46 +-
 ctdb/doc/ctdb_diagnostics.1                       |    6 +-
 ctdb/doc/ctdb_diagnostics.1.html                  |    6 +-
 ctdb/doc/ctdb_mutex_ceph_rados_helper.7           |    6 +-
 ctdb/doc/ctdb_mutex_ceph_rados_helper.7.html      |    4 +-
 ctdb/doc/ctdbd.1                                  |    6 +-
 ctdb/doc/ctdbd.1.html                             |    8 +-
 ctdb/doc/ctdbd.conf.5                             |    6 +-
 ctdb/doc/ctdbd.conf.5.html                        |   62 +-
 ctdb/doc/ctdbd_wrapper.1                          |    6 +-
 ctdb/doc/ctdbd_wrapper.1.html                     |    4 +-
 ctdb/doc/ltdbtool.1                               |    6 +-
 ctdb/doc/ltdbtool.1.html                          |   10 +-
 ctdb/doc/onnode.1                                 |    6 +-
 ctdb/doc/onnode.1.html                            |   14 +-
 ctdb/doc/ping_pong.1                              |    6 +-
 ctdb/doc/ping_pong.1.html                         |    8 +-
 ctdb/server/ctdb_recover.c                        |   28 +-
 ctdb/server/ctdb_recoverd.c                       |   19 +-
 ctdb/server/ctdb_recovery_helper.c                |    1 +
 ctdb/tests/eventscripts/06.nfs.releaseip.001.sh   |   12 +
 ctdb/tests/eventscripts/06.nfs.releaseip.002.sh   |   12 +
 ctdb/tests/eventscripts/06.nfs.takeip.001.sh      |   12 +
 ctdb/tests/eventscripts/06.nfs.takeip.002.sh      |   12 +
 ctdb/tests/eventscripts/60.nfs.monitor.109.sh     |   12 +
 ctdb/tests/eventscripts/60.nfs.releaseip.001.sh   |   12 +
 ctdb/tests/eventscripts/60.nfs.releaseip.002.sh   |   12 +
 ctdb/tests/eventscripts/60.nfs.shutdown.001.sh    |   12 +
 ctdb/tests/eventscripts/60.nfs.shutdown.002.sh    |   12 +
 ctdb/tests/eventscripts/60.nfs.startup.001.sh     |   12 +
 ctdb/tests/eventscripts/60.nfs.startup.002.sh     |   12 +
 ctdb/tests/eventscripts/60.nfs.takeip.001.sh      |   12 +
 ctdb/tests/eventscripts/60.nfs.takeip.002.sh      |   12 +
 docs-xml/Makefile                                 |    2 +-
 docs-xml/manpages/vfs_fruit.8.xml                 |    9 +
 docs/manpages/cifsdd.8                            |    6 +-
 docs/manpages/dbwrap_tool.1                       |   58 +-
 docs/manpages/eventlogadm.8                       |    6 +-
 docs/manpages/findsmb.1                           |    6 +-
 docs/manpages/idmap_ad.8                          |    6 +-
 docs/manpages/idmap_autorid.8                     |    6 +-
 docs/manpages/idmap_hash.8                        |    6 +-
 docs/manpages/idmap_ldap.8                        |    6 +-
 docs/manpages/idmap_nss.8                         |    6 +-
 docs/manpages/idmap_rfc2307.8                     |    6 +-
 docs/manpages/idmap_rid.8                         |    6 +-
 docs/manpages/idmap_script.8                      |    6 +-
 docs/manpages/idmap_tdb.8                         |    6 +-
 docs/manpages/idmap_tdb2.8                        |    6 +-
 docs/manpages/libsmbclient.7                      |    6 +-
 docs/manpages/lmhosts.5                           |    6 +-
 docs/manpages/log2pcap.1                          |   11 +-
 docs/manpages/mvxattr.1                           |    6 +-
 docs/manpages/net.8                               |  140 +-
 docs/manpages/nmbd.8                              |   61 +-
 docs/manpages/nmblookup.1                         |   89 +-
 docs/manpages/ntlm_auth.1                         |   25 +-
 docs/manpages/pam_winbind.8                       |    6 +-
 docs/manpages/pam_winbind.conf.5                  |    6 +-
 docs/manpages/pdbedit.8                           |   58 +-
 docs/manpages/profiles.1                          |   58 +-
 docs/manpages/rpcclient.1                         |  170 ++-
 docs/manpages/samba-regedit.8                     |  165 +-
 docs/manpages/samba-tool.8                        |   48 +-
 docs/manpages/samba.7                             |    6 +-
 docs/manpages/samba.8                             |   61 +-
 docs/manpages/sharesec.1                          |   53 +-
 docs/manpages/smb.conf.5                          |  518 +------
 docs/manpages/smbcacls.1                          |  170 ++-
 docs/manpages/smbclient.1                         |  170 ++-
 docs/manpages/smbcontrol.1                        |   60 +-
 docs/manpages/smbcquotas.1                        |  139 +-
 docs/manpages/smbd.8                              |   65 +-
 docs/manpages/smbget.1                            |   11 +-
 docs/manpages/smbgetrc.5                          |    6 +-
 docs/manpages/smbpasswd.5                         |    6 +-
 docs/manpages/smbpasswd.8                         |   10 +-
 docs/manpages/smbspool.8                          |    6 +-
 docs/manpages/smbspool_krb5_wrapper.8             |    6 +-
 docs/manpages/smbstatus.1                         |   53 +-
 docs/manpages/smbtar.1                            |    6 +-
 docs/manpages/smbtree.1                           |  139 +-
 docs/manpages/testparm.1                          |   44 +-
 docs/manpages/vfs_acl_tdb.8                       |    6 +-
 docs/manpages/vfs_acl_xattr.8                     |    6 +-
 docs/manpages/vfs_aio_fork.8                      |    6 +-
 docs/manpages/vfs_aio_linux.8                     |    6 +-
 docs/manpages/vfs_aio_pthread.8                   |    6 +-
 docs/manpages/vfs_audit.8                         |    6 +-
 docs/manpages/vfs_btrfs.8                         |    6 +-
 docs/manpages/vfs_cacheprime.8                    |    6 +-
 docs/manpages/vfs_cap.8                           |    6 +-
 docs/manpages/vfs_catia.8                         |    6 +-
 docs/manpages/vfs_ceph.8                          |    6 +-
 docs/manpages/vfs_commit.8                        |    6 +-
 docs/manpages/vfs_crossrename.8                   |    6 +-
 docs/manpages/vfs_default_quota.8                 |    6 +-
 docs/manpages/vfs_dirsort.8                       |    6 +-
 docs/manpages/vfs_extd_audit.8                    |    6 +-
 docs/manpages/vfs_fake_perms.8                    |    6 +-
 docs/manpages/vfs_fileid.8                        |    6 +-
 docs/manpages/vfs_fruit.8                         |   14 +-
 docs/manpages/vfs_full_audit.8                    |    6 +-
 docs/manpages/vfs_glusterfs.8                     |    6 +-
 docs/manpages/vfs_gpfs.8                          |    6 +-
 docs/manpages/vfs_linux_xfs_sgid.8                |    6 +-
 docs/manpages/vfs_media_harmony.8                 |    6 +-
 docs/manpages/vfs_netatalk.8                      |    6 +-
 docs/manpages/vfs_offline.8                       |    6 +-
 docs/manpages/vfs_prealloc.8                      |    6 +-
 docs/manpages/vfs_preopen.8                       |    6 +-
 docs/manpages/vfs_readahead.8                     |    6 +-
 docs/manpages/vfs_readonly.8                      |    6 +-
 docs/manpages/vfs_recycle.8                       |    6 +-
 docs/manpages/vfs_shadow_copy.8                   |    6 +-
 docs/manpages/vfs_shadow_copy2.8                  |    6 +-
 docs/manpages/vfs_shell_snap.8                    |    6 +-
 docs/manpages/vfs_snapper.8                       |    6 +-
 docs/manpages/vfs_streams_depot.8                 |    6 +-
 docs/manpages/vfs_streams_xattr.8                 |    6 +-
 docs/manpages/vfs_syncops.8                       |    6 +-
 docs/manpages/vfs_time_audit.8                    |    6 +-
 docs/manpages/vfs_tsmsm.8                         |    6 +-
 docs/manpages/vfs_unityed_media.8                 |    6 +-
 docs/manpages/vfs_worm.8                          |    6 +-
 docs/manpages/vfs_xattr_tdb.8                     |    6 +-
 docs/manpages/vfs_zfsacl.8                        |    6 +-
 docs/manpages/vfstest.1                           |   53 +-
 docs/manpages/wbinfo.1                            |   19 +-
 docs/manpages/winbind_krb5_locator.7              |    6 +-
 docs/manpages/winbindd.8                          |   58 +-
 lib/krb5_wrap/krb5_samba.c                        |  187 +++
 lib/krb5_wrap/krb5_samba.h                        |   10 +
 lib/ldb/wscript                                   |   19 +-
 lib/replace/test/os2_delete.c                     |    2 +-
 lib/replace/wscript                               |    3 +-
 libcli/auth/netlogon_creds_cli.c                  |   78 +-
 libcli/auth/netlogon_creds_cli.h                  |   16 +-
 libcli/auth/proto.h                               |    2 +-
 libcli/auth/smbencrypt.c                          |    2 +-
 libcli/smb/smb1cli_session.c                      |   28 +-
 libcli/smb/smbXcli_base.c                         |   52 +
 libcli/smb/smbXcli_base.h                         |    3 +
 libcli/smb/smb_util.h                             |    3 +-
 libcli/smb/util.c                                 |   47 +-
 librpc/idl/idl_types.h                            |    6 +
 librpc/idl/lsa.idl                                |    2 +-
 librpc/idl/netlogon.idl                           |    6 +-
 librpc/ndr/libndr.h                               |   24 +-
 librpc/ndr/ndr.c                                  |   23 +
 librpc/ndr/ndr_basic.c                            |   44 +
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm          |    4 +
 python/samba/netcmd/user.py                       |    2 +-
 selftest/target/Samba3.pm                         |   22 +-
 selftest/target/Samba4.pm                         |   75 +-
 source3/client/client.c                           |    5 +-
 source3/client/smbspool_krb5_wrapper.c            |   29 +-
 source3/include/ntioctl.h                         |    2 +-
 source3/include/proto.h                           |    1 +
 source3/include/secrets.h                         |   38 +-
 source3/lib/messages.c                            |    6 +-
 source3/lib/popt_common.c                         |   15 +
 source3/lib/util_sd.c                             |   24 +-
 source3/libads/kerberos.c                         |  200 ---
 source3/libads/kerberos_keytab.c                  |   14 +-
 source3/libads/kerberos_proto.h                   |    8 -
 source3/libads/util.c                             |  106 +-
 source3/libnet/libnet_join.c                      |  127 +-
 source3/libnet/libnet_keytab.c                    |    5 +-
 source3/librpc/crypto/gse_krb5.c                  |   40 +-
 source3/librpc/idl/libnet_join.idl                |    4 +-
 source3/librpc/idl/secrets.idl                    |   92 +-
 source3/librpc/wscript_build                      |    2 +-
 source3/libsmb/cliconnect.c                       |   97 +-
 source3/libsmb/clidfs.c                           |   18 +-
 source3/libsmb/clientgen.c                        |   67 +-
 source3/libsmb/libsmb_dir.c                       |    6 +-
 source3/libsmb/proto.h                            |    7 +-
 source3/libsmb/trusts_util.c                      |  276 +++-
 source3/modules/vfs_ceph.c                        |    7 -
 source3/modules/vfs_default.c                     |   33 +-
 source3/modules/vfs_fruit.c                       |   12 +-
 source3/modules/vfs_shadow_copy.c                 |   11 +-
 source3/passdb/machine_account_secrets.c          | 1661 +++++++++++++++++++--
 source3/passdb/secrets.c                          |   25 +-
 source3/passdb/secrets_lsa.c                      |    2 +-
 source3/rpc_client/cli_netlogon.c                 |   15 +-
 source3/rpcclient/cmd_netlogon.c                  |    2 +
 source3/script/tests/test_shadow_copy.sh          |   23 +
 source3/script/tests/test_smbclient_basic.sh      |   62 +
 source3/script/tests/test_smbclient_s3.sh         |   55 +
 source3/script/tests/test_smbclient_tarmode.sh    |   10 +-
 source3/script/tests/test_wbinfo_sids2xids_int.py |   25 +-
 source3/selftest/tests.py                         |    5 +-
 source3/smbd/files.c                              |    4 +-
 source3/smbd/lanman.c                             |   20 +-
 source3/smbd/open.c                               |   54 +-
 source3/smbd/process.c                            |    2 +-
 source3/smbd/reply.c                              |    2 +-
 source3/smbd/server.c                             |    8 +-
 source3/smbd/smb2_create.c                        |   43 +-
 source3/smbd/smb2_ioctl_network_fs.c              |   17 +
 source3/smbd/smb2_sesssetup.c                     |    1 +
 source3/smbd/smb2_tcon.c                          |    2 +
 source3/torture/test_smb2.c                       |    8 +-
 source3/torture/torture.c                         |   24 +-
 source3/utils/net.c                               |  142 +-
 source3/utils/net_rpc.c                           |   20 +-
 source3/utils/smbcacls.c                          |   26 +-
 source3/winbindd/idmap_ad.c                       |   19 +-
 source3/winbindd/winbindd_cm.c                    |    8 +-
 source3/winbindd/winbindd_dual.c                  |    1 +
 source3/winbindd/winbindd_dual_srv.c              |    2 +
 source4/dsdb/samdb/ldb_modules/netlogon.c         |    6 +-
 source4/rpc_server/dnsserver/dnsdata.c            |    4 +-
 source4/torture/drs/python/replica_sync.py        |   51 -
 source4/torture/ldap/netlogon.c                   |   48 +
 source4/torture/masktest.c                        |    2 +-
 source4/torture/ndr/string.c                      |   20 +-
 source4/torture/vfs/fruit.c                       |    8 +-
 237 files changed, 6381 insertions(+), 1997 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