[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  1b7029b... s4:torture/winreg.c - fix warnings of Solaris 10 cc through the appropriate casts
       via  380b2cb... s4:torture/winreg.c - remove unreachable code
       via  f0c4a1a... s4:torture/winreg.c - add a FIXME comment on a codepart which isn't standard C-compatible
      from  f5f236a... s4:dcesrv_netr_LogonGetDomainInfo - improve the client OS informations update

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


- Log -----------------------------------------------------------------
commit 1b7029b47be296588b80e4c2ba871dba572cf18e
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sat Jul 31 20:59:02 2010 +0200

    s4:torture/winreg.c - fix warnings of Solaris 10 cc through the appropriate casts

commit 380b2cb4b0d9e63b2825840697604bd977b40807
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sat Jul 31 20:58:47 2010 +0200

    s4:torture/winreg.c - remove unreachable code

commit f0c4a1aff4407826c301c54f58d0fb65c71c4a07
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sat Jul 31 20:57:18 2010 +0200

    s4:torture/winreg.c - add a FIXME comment on a codepart which isn't standard C-compatible
    
    It seems to be GCC specific since it doesn't compile on Solaris 10 cc:
    http://build.samba.org/?function=View+Build;host=sunX;tree=samba_4_0_waf;compiler=cc

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

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


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index f9cfb4d..c97a3dd 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2385,6 +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 {
 		const char *values[3];
 		uint32_t num_values;
@@ -2677,8 +2678,6 @@ static const char *kernel_mode_registry_path(struct torture_context *tctx,
 		torture_warning(tctx, "unsupported hkey: 0x%08x\n", hkey);
 		return NULL;
 	}
-
-	return NULL;
 }
 
 static bool test_symlink_keys(struct torture_context *tctx,
@@ -3105,16 +3104,16 @@ struct torture_suite *torture_rpc_winreg(TALLOC_CTX *mem_ctx)
 
 	torture_rpc_tcase_add_test_ex(tcase, "HKLM",
 				      test_Open,
-				      (winreg_open_fn)dcerpc_winreg_OpenHKLM_r);
+				      (void *)dcerpc_winreg_OpenHKLM_r);
 	torture_rpc_tcase_add_test_ex(tcase, "HKU",
 				      test_Open,
-				      (winreg_open_fn)dcerpc_winreg_OpenHKU_r);
+				      (void *)dcerpc_winreg_OpenHKU_r);
 	torture_rpc_tcase_add_test_ex(tcase, "HKCR",
 				      test_Open,
-				      (winreg_open_fn)dcerpc_winreg_OpenHKCR_r);
+				      (void *)dcerpc_winreg_OpenHKCR_r);
 	torture_rpc_tcase_add_test_ex(tcase, "HKCU",
 				      test_Open,
-				      (winreg_open_fn)dcerpc_winreg_OpenHKCU_r);
+				      (void *)dcerpc_winreg_OpenHKCU_r);
 
 	return suite;
 }


-- 
Samba Shared Repository