[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  001e23f ntlmssp.idl: don't generate python bindings for ntlmssp_NTLM_RESPONSE and ntlmssp_LM_RESPONSE
       via  0f1859b spoolss.idl: use access mask defines from security.idl
       via  63686a1 nfs4acl.idl: rename interface to nfs4acl.idl to avoid naming clash in the python bindings
      from  caff670 libcli: Remove code clone

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


- Log -----------------------------------------------------------------
commit 001e23fd6250f8426b0866370fb4fdcbe5b29147
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 13 07:25:38 2016 +0200

    ntlmssp.idl: don't generate python bindings for ntlmssp_NTLM_RESPONSE and ntlmssp_LM_RESPONSE
    
    ntlmssp_NTLM_RESPONSE and NTLM_RESPONSE will both result in
    "ntlmssp.NTLM_RESPONSE".
    
    The same applies to ntlmssp_LM_RESPONSE and LM_RESPONSE.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Thu Oct 13 21:56:27 CEST 2016 on sn-devel-144

commit 0f1859b85ec7b755c7a3f39ae57a250858cf8252
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 13 06:30:34 2016 +0200

    spoolss.idl: use access mask defines from security.idl
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

commit 63686a1c82126f0aa90317e4790d01b4bcf1a9e1
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 13 08:07:21 2016 +0200

    nfs4acl.idl: rename interface to nfs4acl.idl to avoid naming clash in the python bindings
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 librpc/idl/nfs4acl.idl | 2 +-
 librpc/idl/ntlmssp.idl | 4 ++--
 librpc/idl/spoolss.idl | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/nfs4acl.idl b/librpc/idl/nfs4acl.idl
index aeab0a0..13a6d13 100644
--- a/librpc/idl/nfs4acl.idl
+++ b/librpc/idl/nfs4acl.idl
@@ -11,7 +11,7 @@ import "misc.idl", "security.idl";
   version(1.0),
   pointer_default(unique)
 ]
-interface nfs4acl
+interface nfs4acl_interface
 {
 	const char *NFS4ACL_XATTR_NAME = "system.nfs4acl";
 
diff --git a/librpc/idl/ntlmssp.idl b/librpc/idl/ntlmssp.idl
index f041e32..6b22886 100644
--- a/librpc/idl/ntlmssp.idl
+++ b/librpc/idl/ntlmssp.idl
@@ -207,7 +207,7 @@ interface ntlmssp
 		uint8 ChallengeFromClient[8];
 	} LMv2_RESPONSE;
 
-	typedef [nodiscriminant] union {
+	typedef [nopython,nodiscriminant] union {
 		[case(24)] LM_RESPONSE v1;
 		[default];
 	} ntlmssp_LM_RESPONSE;
@@ -238,7 +238,7 @@ interface ntlmssp
 		NTLMv2_CLIENT_CHALLENGE Challenge;
 	} NTLMv2_RESPONSE;
 
-	typedef [public,nodiscriminant] union {
+	typedef [public,nopython,nodiscriminant] union {
 		[case(0)] ;
 		[case(0x18)] NTLM_RESPONSE v1;
 		[default] NTLMv2_RESPONSE v2;
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 9010a95..df19bee 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -2867,10 +2867,10 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
 						PRINTER_ALL_ACCESS;
 
 	const int PRINTER_ACE_MANAGE_DOCUMENTS = SEC_GENERIC_ALL |
-						READ_CONTROL_ACCESS;
+						 SEC_STD_READ_CONTROL;
 
-	const int PRINTER_ACE_PRINT	= GENERIC_EXECUTE_ACCESS |
-					  READ_CONTROL_ACCESS |
+	const int PRINTER_ACE_PRINT	= SEC_GENERIC_EXECUTE |
+					  SEC_STD_READ_CONTROL |
 					  PRINTER_ACCESS_USE;
 
 	/******************/


-- 
Samba Shared Repository