[Pkg-samba-maint] [samba] 02/04: Merge tag 'upstream/3.6.18'

[Ivo De Decker]

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

idd-guest pushed a commit to branch master
in repository samba.

commit 380e4f99dda45bae30264dd329a3e34a1f698af1
Merge: a80e947 2cc23a0
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Tue Aug 20 21:47:03 2013 +0200

    Merge tag 'upstream/3.6.18'
    
    Upstream version 3.6.18

 WHATSNEW.txt                             |   61 ++++++++++++-
 docs-xml/manpages-3/idmap_ad.8.xml       |    9 +-
 docs/manpages/dbwrap_tool.1              |    4 +-
 docs/manpages/eventlogadm.8              |    4 +-
 docs/manpages/findsmb.1                  |    4 +-
 docs/manpages/idmap_ad.8                 |    6 +-
 docs/manpages/idmap_adex.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_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                 |    6 +-
 docs/manpages/net.8                      |    6 +-
 docs/manpages/nmbd.8                     |    6 +-
 docs/manpages/nmblookup.1                |    6 +-
 docs/manpages/ntlm_auth.1                |    6 +-
 docs/manpages/pam_winbind.8              |    4 +-
 docs/manpages/pam_winbind.conf.5         |    4 +-
 docs/manpages/pdbedit.8                  |    6 +-
 docs/manpages/profiles.1                 |    6 +-
 docs/manpages/rpcclient.1                |    6 +-
 docs/manpages/samba.7                    |    4 +-
 docs/manpages/sharesec.1                 |    6 +-
 docs/manpages/smb.conf.5                 |    4 +-
 docs/manpages/smbcacls.1                 |    6 +-
 docs/manpages/smbclient.1                |    6 +-
 docs/manpages/smbcontrol.1               |    6 +-
 docs/manpages/smbcquotas.1               |    6 +-
 docs/manpages/smbd.8                     |    6 +-
 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                |    6 +-
 docs/manpages/smbta-util.8               |    4 +-
 docs/manpages/smbtar.1                   |    4 +-
 docs/manpages/smbtree.1                  |    6 +-
 docs/manpages/swat.8                     |    6 +-
 docs/manpages/tdbbackup.8                |    4 +-
 docs/manpages/tdbdump.8                  |    4 +-
 docs/manpages/tdbtool.8                  |    4 +-
 docs/manpages/testparm.1                 |    6 +-
 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_pthread.8          |    4 +-
 docs/manpages/vfs_audit.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_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_time_audit.8           |    4 +-
 docs/manpages/vfs_xattr_tdb.8            |    4 +-
 docs/manpages/vfstest.1                  |    6 +-
 docs/manpages/wbinfo.1                   |    6 +-
 docs/manpages/winbind_krb5_locator.7     |    4 +-
 docs/manpages/winbindd.8                 |    6 +-
 lib/replace/libreplace_macros.m4         |    2 +-
 librpc/idl/security.idl                  |    3 +
 packaging/RHEL-CTDB/samba.spec           |    2 +-
 packaging/RHEL/makerpms.sh               |    2 +-
 packaging/RHEL/samba.spec                |    2 +-
 pidl/idl.yp                              |    4 +-
 pidl/lib/Parse/Pidl/IDL.pm               |    4 +-
 selftest/target/Samba3.pm                |    2 +
 source3/VERSION                          |    2 +-
 source3/configure                        |   20 +++--
 source3/configure.in                     |    5 +-
 source3/include/version.h                |    4 +-
 source3/librpc/gen_ndr/ndr_security.c    |    3 +
 source3/librpc/gen_ndr/py_security.c     |    3 +
 source3/librpc/gen_ndr/security.h        |    3 +
 source3/modules/vfs_dirsort.c            |  142 ++++++++++++++++++------------
 source3/modules/vfs_gpfs.c               |    6 ++
 source3/smbd/nttrans.c                   |    9 +-
 source3/smbd/oplock_linux.c              |   33 ++++---
 source3/winbindd/idmap_ad.c              |    5 +-
 104 files changed, 411 insertions(+), 287 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git