[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Thu May 21 17:45:10 MDT 2015


The branch, master has been updated
       via  6fbbca5 Update 4.2 Roadmap file
       via  1afb7cc vfs_hpuxacl: Fix typo in comment...
      from  af2fb66 s3-spoolss: use talloc_zero in spoolss notify code

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6fbbca5b99caf664e8753b3f398d4178e573dbf1
Author: Marc Muehlfeld <mmuehlfeld at samba.org>
Date:   Tue May 19 17:15:41 2015 +0200

    Update 4.2 Roadmap file
    
    The Roadmap file wasn't refreshed before releasing 4.2. It
    still contained the content it had in 4.1. Updated the
    file accordingly.
    
    Signed-off-by: Marc Muehlfeld <mmuehlfeld at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Fri May 22 01:44:19 CEST 2015 on sn-devel-104

commit 1afb7cc92e8eee77b5b86e6c5c2d4737bcf17837
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu May 21 15:00:32 2015 +0200

    vfs_hpuxacl: Fix typo in comment...
    
    and remove some trailing whitespaces.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 Roadmap                       | 14 +++++++-------
 source3/modules/vfs_hpuxacl.c |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Roadmap b/Roadmap
index 12b9e8f..96b8052 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,4 +1,4 @@
-Copyright (C) 1997-2014 Samba-Team
+Copyright (C) 1997-2015 Samba-Team
 
 The Samba-Team are committed to an aggressive program to deliver quality
 controlled software to a well defined roadmap.
@@ -9,14 +9,14 @@ information.
 The following development objectives for future releases
 are in progress:
 ----------------------------------------------------------------------------
-Samba-3.6.x		This release turned into security maintenance mode since we
-			released 4.1.
+Samba-4.0.x		This release turned into security maintenance mode
+			since we released 4.2.
 
-Samba-4.0.x		Our previous release including the AD domain controller
-                        feature, the file server and other functionality
-                        from Samba 3.6 as well as the new SMB3 protocol.
+Samba-4.1.x		Our previous release including the AD domain
+			controller feature, the file server and other
+			functionality from Samba 4.0.
 
-Samba-4.1.x		Our current release.
+Samba-4.2.x		Our current release.
 
 
 Note that it is a given that the Samba-Team will continue to track
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index 7ffb847..1894146 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -916,9 +916,9 @@ static int hpux_get_needed_class_perm(struct acl *aclp)
 
 /* hpux_internal_aclsort: aclsort for HPUX.
  *
- * -> The aclsort() system call is availabe on the latest HPUX General
- * -> Patch Bundles. So for HPUX, we developed our version of aclsort 
- * -> function. Because, we don't want to update to a new 
+ * -> The aclsort() system call is available on the latest HPUX General
+ * -> Patch Bundles. So for HPUX, we developed our version of aclsort
+ * -> function. Because, we don't want to update to a new
  * -> HPUX GR bundle just for aclsort() call.
  *
  * aclsort sorts the array of ACL structures as per the description in


-- 
Samba Shared Repository


More information about the samba-cvs mailing list