[Pkg-samba-maint] [samba] 01/03: Merge branch 'master' into wheezy-backports

Ivo De Decker idd-guest at alioth.debian.org
Sun Oct 6 16:05:27 UTC 2013


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

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

commit 6e5e604dd309bb369b40762ba4ee5757def51f66
Merge: 2116b5a 432d109
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sun Oct 6 17:28:05 2013 +0200

    Merge branch 'master' into wheezy-backports

 WHATSNEW.txt                              |   80 ++++++++++++++++++++++++++-
 debian/README.source                      |   53 +++++++++++-------
 debian/changelog                          |    7 +++
 docs-xml/manpages-3/vfs_crossrename.8.xml |   20 ++++---
 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_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           |   36 ++++++------
 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 +-
 packaging/RHEL-CTDB/samba.spec            |    2 +-
 packaging/RHEL/makerpms.sh                |    2 +-
 packaging/RHEL/samba.spec                 |    2 +-
 source3/VERSION                           |    2 +-
 source3/include/ntioctl.h                 |    1 +
 source3/include/proto.h                   |    1 +
 source3/include/serverid.h                |    2 +
 source3/include/smb.h                     |    1 +
 source3/include/version.h                 |    4 +-
 source3/lib/serverid.c                    |   42 +++++++++-----
 source3/lib/sessionid_tdb.c               |   25 ++++++---
 source3/libads/kerberos.c                 |   10 ++++
 source3/libnet/libnet_join.c              |    9 +++
 source3/libsmb/dsgetdcname.c              |   85 ++++++++++++++++++++++-------
 source3/rpc_client/cli_netlogon.c         |   13 +++++
 source3/smbd/dosmode.c                    |    5 ++
 source3/smbd/filename.c                   |   27 +++++++--
 source3/smbd/globals.h                    |    2 +
 source3/smbd/nttrans.c                    |    6 +-
 source3/smbd/reply.c                      |   48 ++++++++--------
 source3/smbd/smb2_create.c                |    3 +-
 source3/smbd/smb2_getinfo.c               |   45 +++++++++++++--
 source3/smbd/trans2.c                     |   75 ++++++++++++++++++++++---
 source3/utils/net_serverid.c              |    9 +++
 source3/utils/net_status.c                |    6 ++
 source3/utils/status.c                    |   12 ++++
 source3/winbindd/winbindd_cm.c            |    9 ++-
 source3/winbindd/winbindd_pam.c           |    8 +++
 114 files changed, 692 insertions(+), 326 deletions(-)

diff --cc debian/changelog
index 6d32a67,367c635..624e99e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ samba (2:3.6.19-1) unstable; urgency=low
+ 
+   * Team upload.
+   * New upstream release
+ 
+  -- Ivo De Decker <ivo.dedecker at ugent.be>  Wed, 25 Sep 2013 20:01:48 +0200
+ 
 +samba (2:3.6.18-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Ivo De Decker <ivo.dedecker at ugent.be>  Sun, 01 Sep 2013 15:04:28 +0200
 +
  samba (2:3.6.18-1) unstable; urgency=low
  
    * Team upload.

-- 
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