[SCM] Samba Shared Repository - branch master updated - 7ca8be13842a488691e33ba3edd0b714e5e3ae6a

[Günther Deschner]

The branch, master has been updated
       via  7ca8be13842a488691e33ba3edd0b714e5e3ae6a (commit)
       via  bb6681ef9d9ae0e1000ebded56bdb2d14c5c795b (commit)
       via  84cc8f5d111ca4788ea38633c5b9704d49332878 (commit)
       via  1abf41e0555f9728ee82ddb9b2bbba5ea004a3b3 (commit)
      from  72af9b01dc7ee00d79908760af6051f8794fa2b8 (commit)

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


- Log -----------------------------------------------------------------
commit 7ca8be13842a488691e33ba3edd0b714e5e3ae6a
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 1 01:37:31 2008 +0100

    s4-smbtorture: fix segfault in RPC-SAMLOGON test.
    
    Use torture_context when calling test_ChangePasswordUser3.
    
    Guenther

commit bb6681ef9d9ae0e1000ebded56bdb2d14c5c795b
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 1 00:00:03 2008 +0100

    s3-net: fix build warning.
    
    Jeremy, please check.
    
    Guenther

commit 84cc8f5d111ca4788ea38633c5b9704d49332878
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 31 22:39:25 2008 +0100

    s3-accessmask: re-run make samba3-idl and remove duplicate copies.
    
    Guenther

commit 1abf41e0555f9728ee82ddb9b2bbba5ea004a3b3
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 31 23:58:25 2008 +0100

    security-idl: fix typo.
    
    Guenther

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

Summary of changes:
 librpc/idl/security.idl           |    6 +++---
 source3/include/rpc_secdes.h      |   15 ---------------
 source3/librpc/gen_ndr/security.h |    6 ++++++
 source3/utils/net_dns.c           |    2 +-
 source4/torture/rpc/samlogon.c    |    2 +-
 5 files changed, 11 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index a313a2c..690f406 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -138,9 +138,9 @@ interface security
 
 	/* combinations of standard masks. */
 	const int STANDARD_RIGHTS_ALL_ACCESS		= SEC_STD_ALL; /* 0x001f0000 */
-	const int STANDARD_RIGHTS_MODIFY_ACCESS		= SEC_STD_READ_CONTROLS; /* 0x00020000 */
-	const int STANDARD_RIGHTS_EXECUTE_ACCESS	= SEC_STD_READ_CONTROLS; /* 0x00020000 */
-	const int STANDARD_RIGHTS_READ_ACCESS		= SEC_STD_READ_CONTROLS; /* 0x00020000 */
+	const int STANDARD_RIGHTS_MODIFY_ACCESS		= SEC_STD_READ_CONTROL; /* 0x00020000 */
+	const int STANDARD_RIGHTS_EXECUTE_ACCESS	= SEC_STD_READ_CONTROL; /* 0x00020000 */
+	const int STANDARD_RIGHTS_READ_ACCESS		= SEC_STD_READ_CONTROL; /* 0x00020000 */
 	const int STANDARD_RIGHTS_WRITE_ACCESS =
 		(SEC_STD_WRITE_OWNER		|
 		 SEC_STD_WRITE_DAC		|
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 15adebe..a1cfad9 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -146,21 +146,6 @@ struct standard_mapping {
 
 #define STD_RIGHT_ALL_ACCESS		0x001F0000
 
-/* Combinations of standard masks. */
-#define STANDARD_RIGHTS_ALL_ACCESS	STD_RIGHT_ALL_ACCESS /* 0x001f0000 */
-#define STANDARD_RIGHTS_MODIFY_ACCESS	STD_RIGHT_READ_CONTROL_ACCESS /* 0x00020000 */
-#define STANDARD_RIGHTS_EXECUTE_ACCESS	STD_RIGHT_READ_CONTROL_ACCESS /* 0x00020000 */
-#define STANDARD_RIGHTS_READ_ACCESS	STD_RIGHT_READ_CONTROL_ACCESS /* 0x00020000 */
-#define STANDARD_RIGHTS_WRITE_ACCESS \
-		(STD_RIGHT_WRITE_OWNER_ACCESS	| \
-		 STD_RIGHT_WRITE_DAC_ACCESS	| \
-		 STD_RIGHT_DELETE_ACCESS)	/* 0x000d0000 */
-#define STANDARD_RIGHTS_REQUIRED_ACCESS \
-		(STD_RIGHT_DELETE_ACCESS	| \
-		STD_RIGHT_READ_CONTROL_ACCESS	| \
-		STD_RIGHT_WRITE_DAC_ACCESS	| \
-		STD_RIGHT_WRITE_OWNER_ACCESS)	/* 0x000f0000 */
-
 /* File Object specific access rights */
 
 #define SA_RIGHT_FILE_READ_DATA		0x00000001
diff --git a/source3/librpc/gen_ndr/security.h b/source3/librpc/gen_ndr/security.h
index 5b77d76..bb06dc2 100644
--- a/source3/librpc/gen_ndr/security.h
+++ b/source3/librpc/gen_ndr/security.h
@@ -68,6 +68,12 @@
 #define SEC_RIGHTS_DIR_WRITE	( SEC_RIGHTS_FILE_WRITE )
 #define SEC_RIGHTS_DIR_EXECUTE	( SEC_RIGHTS_FILE_EXECUTE )
 #define SEC_RIGHTS_DIR_ALL	( SEC_RIGHTS_FILE_ALL )
+#define STANDARD_RIGHTS_ALL_ACCESS	( SEC_STD_ALL )
+#define STANDARD_RIGHTS_MODIFY_ACCESS	( SEC_STD_READ_CONTROL )
+#define STANDARD_RIGHTS_EXECUTE_ACCESS	( SEC_STD_READ_CONTROL )
+#define STANDARD_RIGHTS_READ_ACCESS	( SEC_STD_READ_CONTROL )
+#define STANDARD_RIGHTS_WRITE_ACCESS	( (SEC_STD_WRITE_OWNER|SEC_STD_WRITE_DAC|SEC_STD_DELETE) )
+#define STANDARD_RIGHTS_REQUIRED_ACCESS	( (SEC_STD_DELETE|SEC_STD_READ_CONTROL|SEC_STD_WRITE_DAC|SEC_STD_WRITE_OWNER) )
 #define SID_NULL	( "S-1-0-0" )
 #define NAME_WORLD	( "WORLD" )
 #define SID_WORLD_DOMAIN	( "S-1-1" )
diff --git a/source3/utils/net_dns.c b/source3/utils/net_dns.c
index 4e617a1..f4ad6f7 100644
--- a/source3/utils/net_dns.c
+++ b/source3/utils/net_dns.c
@@ -169,7 +169,7 @@ int get_my_ip_address( struct sockaddr_storage **pp_ss )
 			continue;
 
 		/* Don't register loopback addresses */
-		if (is_loopback_addr(nic_sa_storage)) {
+		if (is_loopback_addr((struct sockaddr *)nic_sa_storage)) {
 			continue;
 		}
 
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 9a70760..db4657e 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1567,7 +1567,7 @@ bool torture_rpc_samlogon(struct torture_context *torture)
 
 	old_user_password = user_password;
 
-	test_ChangePasswordUser3(torture_join_samr_pipe(user_ctx), mem_ctx,
+	test_ChangePasswordUser3(torture_join_samr_pipe(user_ctx), torture,
 				 TEST_USER_NAME, 16 /* > 14 */, &user_password, 
 				 NULL, 0, false);
 


-- 
Samba Shared Repository