[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  e56fa1f nfs4acls: Fix SMB_ACE4_MAX_TYPE define
       via  4194c07 ctdb-conn: add missing variable initialization
      from  34d98a8 Replaced string "Samba 4" with "Samba AD"

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


- Log -----------------------------------------------------------------
commit e56fa1f0e3fc42afe725c877d633333add65ec8e
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 10 14:24:31 2016 +0200

    nfs4acls: Fix SMB_ACE4_MAX_TYPE define
    
    ACE4_SYSTEM_ALARM_ACE_TYPE does not exist
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Tue Oct 11 02:17:10 CEST 2016 on sn-devel-144

commit 4194c0797f78293fe48105ce5af70f36a3c233a8
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date:   Mon Oct 10 16:26:05 2016 +0200

    ctdb-conn: add missing variable initialization
    
    Avoid potential crash in TALLOC_FREE(hdr).
    
    Signed-off-by: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 source3/lib/ctdbd_conn.c    | 2 +-
 source3/modules/nfs4_acls.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 1f8ac94..118f3a0 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -765,7 +765,7 @@ int ctdbd_db_attach(struct ctdbd_connection *conn,
 int ctdbd_migrate(struct ctdbd_connection *conn, uint32_t db_id, TDB_DATA key)
 {
 	struct ctdb_req_call_old req;
-	struct ctdb_req_header *hdr;
+	struct ctdb_req_header *hdr = NULL;
 	struct iovec iov[2];
 	ssize_t nwritten;
 	int ret;
diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h
index ba6761d..a73b315 100644
--- a/source3/modules/nfs4_acls.h
+++ b/source3/modules/nfs4_acls.h
@@ -65,7 +65,7 @@ typedef struct _SMB_ACE4PROP_T {
 #define	SMB_ACE4_ACCESS_DENIED_ACE_TYPE	0x00000001
 #define	SMB_ACE4_SYSTEM_AUDIT_ACE_TYPE	0x00000002
 #define	SMB_ACE4_SYSTEM_ALARM_ACE_TYPE	0x00000003
-#define SMB_ACE4_MAX_TYPE	ACE4_SYSTEM_ALARM_ACE_TYPE  /* largest valid ACE4_TYPE */
+#define SMB_ACE4_MAX_TYPE	SMB_ACE4_SYSTEM_ALARM_ACE_TYPE  /* largest valid ACE4_TYPE */
 
 	uint32_t aceFlags;	/* Controls Inheritance and such */
 /*The bitmask constants used for the flag field are as follows: */


-- 
Samba Shared Repository