[SCM] Samba Shared Repository - branch master updated

[Richard Sharpe]

The branch, master has been updated
       via  7d3c26e Make sure we claim that a DACL or SACL is present if the SD says so
      from  786cb13 Fix an IPv6 breakage I introduced by adding an strlcpy truncation check. Found by Matthieu Patou <mat at samba.org>.

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


- Log -----------------------------------------------------------------
commit 7d3c26e8cfcffb519990d5d2d70af3307e34c15f
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date:   Fri Mar 30 22:02:25 2012 -0700

    Make sure we claim that a DACL or SACL is present if the SD says so
    
    Autobuild-User: Richard Sharpe <sharpe at samba.org>
    Autobuild-Date: Sat Mar 31 09:34:36 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/libsmb/clisecdesc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c
index aef3432..04f661c 100644
--- a/source3/libsmb/clisecdesc.c
+++ b/source3/libsmb/clisecdesc.c
@@ -92,9 +92,9 @@ NTSTATUS cli_set_secdesc(struct cli_state *cli, uint16_t fnum,
 
 	SIVAL(param, 0, fnum);
 
-	if (sd->dacl)
+	if (sd->dacl || (sd->type & SEC_DESC_DACL_PRESENT))
 		sec_info |= SECINFO_DACL;
-	if (sd->sacl)
+	if (sd->sacl || (sd->type & SEC_DESC_SACL_PRESENT))
 		sec_info |= SECINFO_SACL;
 	if (sd->owner_sid)
 		sec_info |= SECINFO_OWNER;


-- 
Samba Shared Repository