[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  b99a02a... s4:torture/rpc/winreg: fix "strict aliasing" compiler warnings
       via  c7ba3c4... s4:torture/rpc/winreg: fix the build with non gcc compilers (e.g. on solaris)
      from  81cc92c... s4:ldap.py - performs some "systemFlags" testing

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


- Log -----------------------------------------------------------------
commit b99a02a7d4b21e37b9ff61171311ca1b143e2b14
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Aug 1 11:18:05 2010 +0200

    s4:torture/rpc/winreg: fix "strict aliasing" compiler warnings
    
    metze

commit c7ba3c4dcf77e51434783e5da2b505bf6c7a14c4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Aug 1 11:17:14 2010 +0200

    s4:torture/rpc/winreg: fix the build with non gcc compilers (e.g. on solaris)
    
    metze

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

Summary of changes:
 source4/torture/rpc/winreg.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index c97a3dd..84139af 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -1649,7 +1649,7 @@ static bool test_QueryMultipleValues_full(struct dcerpc_binding_handle *b,
 					  struct torture_context *tctx,
 					  struct policy_handle *handle,
 					  uint32_t num_values,
-					  const char **valuenames,
+					  const char * const *valuenames,
 					  bool existing_value)
 {
 	struct winreg_QueryMultipleValues r;
@@ -1719,7 +1719,7 @@ static bool test_QueryMultipleValues2_full(struct dcerpc_binding_handle *b,
 					   struct torture_context *tctx,
 					   struct policy_handle *handle,
 					   uint32_t num_values,
-					   const char **valuenames,
+					   const char * const *valuenames,
 					   bool existing_value)
 {
 	struct winreg_QueryMultipleValues2 r;
@@ -2385,8 +2385,7 @@ static bool test_HKLM_wellknown(struct torture_context *tctx,
 {
 	struct policy_handle newhandle;
 	int i;
-	/* FIXME: This is GCC specific and breaks Solaris 10 "cc" */
-	struct {
+	static const struct {
 		const char *values[3];
 		uint32_t num_values;
 		bool existing_value;
@@ -2526,21 +2525,21 @@ static bool test_OpenHive(struct torture_context *tctx,
 		break;
 	case HKEY_CURRENT_USER:
 		torture_assert_ntstatus_ok(tctx,
-			dcerpc_winreg_OpenHKCU_r(b, tctx, (struct winreg_OpenHKCU *)&r),
+			dcerpc_winreg_OpenHKCU_r(b, tctx, (struct winreg_OpenHKCU *)(void *)&r),
 			"failed to open HKCU");
 		torture_assert_werr_ok(tctx, r.out.result,
 			"failed to open HKCU");
 		break;
 	case HKEY_USERS:
 		torture_assert_ntstatus_ok(tctx,
-			dcerpc_winreg_OpenHKU_r(b, tctx, (struct winreg_OpenHKU *)&r),
+			dcerpc_winreg_OpenHKU_r(b, tctx, (struct winreg_OpenHKU *)(void *)&r),
 			"failed to open HKU");
 		torture_assert_werr_ok(tctx, r.out.result,
 			"failed to open HKU");
 		break;
 	case HKEY_CLASSES_ROOT:
 		torture_assert_ntstatus_ok(tctx,
-			dcerpc_winreg_OpenHKCR_r(b, tctx, (struct winreg_OpenHKCR *)&r),
+			dcerpc_winreg_OpenHKCR_r(b, tctx, (struct winreg_OpenHKCR *)(void *)&r),
 			"failed to open HKCR");
 		torture_assert_werr_ok(tctx, r.out.result,
 			"failed to open HKCR");


-- 
Samba Shared Repository