[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  12d1a3b... s3: Fix the build of the nfsv4 acl code
      from  8131e9f... s4-smbtorture: move PrintProcessors winreg test to main RPC-SPOOLSS test.

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


- Log -----------------------------------------------------------------
commit 12d1a3b0a5367b4f920d32e6cb1fcdc2f7d17513
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 3 16:09:31 2010 +0200

    s3: Fix the build of the nfsv4 acl code

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 83e8f38..36a3057 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "nfs4_acls.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS
@@ -331,7 +332,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
 	}
 
 	DEBUG(10, ("smb_get_nt_acl_nfs4_common successfully exited with sd_size %d\n",
-		   (int)ndr_size_security_descriptor(*ppdesc, NULL, 0)));
+		   (int)ndr_size_security_descriptor(*ppdesc, 0)));
 
 	return NT_STATUS_OK;
 }


-- 
Samba Shared Repository