The branch, master has been updated
via c82bcef s4:client/cifsdd.c - restore Solaris cc compatibility
via ad25264 s4:torture/rpc/winreg.c - restore Solaris cc compatibility
from 59559bd s4:libcli/security/*.c - fix some wrong typed counters
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c82bcef16d386c846410dbe2e79f9fad619fc4ea
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Sep 9 21:29:21 2010 +0200
s4:client/cifsdd.c - restore Solaris cc compatibility
"static const struct"s need to be global in order to work with Solaris cc.
commit ad25264dd7c815449ee361d342fd3b7e74f8d0bb
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Sep 9 21:26:43 2010 +0200
s4:torture/rpc/winreg.c - restore Solaris cc compatibility
"static const struct"s need to be global in order to work with Solaris cc.
-----------------------------------------------------------------------
Summary of changes:
source4/client/cifsdd.c | 21 +++---
source4/torture/rpc/winreg.c | 143 +++++++++++++++++++++---------------------
2 files changed, 82 insertions(+), 82 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 1cd0b64..adf2d72 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -60,19 +60,18 @@ static void dd_handle_signal(int sig)
/* Argument handling. */
/* ------------------------------------------------------------------------- */
+static const struct {
+ enum argtype arg_type;
+ const char * arg_name;
+} names [] = {
+ { ARG_NUMERIC, "COUNT" },
+ { ARG_SIZE, "SIZE" },
+ { ARG_PATHNAME, "FILE" },
+ { ARG_BOOL, "BOOLEAN" },
+};
+
static const char * argtype_str(enum argtype arg_type)
{
- static const struct {
- enum argtype arg_type;
- const char * arg_name;
- } names [] =
- {
- { ARG_NUMERIC, "COUNT" },
- { ARG_SIZE, "SIZE" },
- { ARG_PATHNAME, "FILE" },
- { ARG_BOOL, "BOOLEAN" },
- };
-
int i;
for (i = 0; i < ARRAY_SIZE(names); ++i) {
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 9ee68c6..c2dd8b1 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2405,83 +2405,84 @@ static bool test_create_keynames(struct
dcerpc_binding_handle *b,
#define VALUE_CURRENT_VERSION "CurrentVersion"
#define VALUE_SYSTEM_ROOT "SystemRoot"
+static const struct {
+ const char *values[3];
+ uint32_t num_values;
+ bool existing_value;
+ const char *error_message;
+} multiple_values_tests[] = {
+ {
+ .values[0] = VALUE_CURRENT_VERSION,
+ .values[1] = NULL,
+ .values[2] = NULL,
+ .num_values = 1,
+ .existing_value = true,
+ .error_message = NULL
+ },{
+ .values[0] = VALUE_SYSTEM_ROOT,
+ .values[1] = NULL,
+ .values[2] = NULL,
+ .num_values = 1,
+ .existing_value = true,
+ .error_message = NULL
+ },{
+ .values[0] = VALUE_CURRENT_VERSION,
+ .values[1] = VALUE_SYSTEM_ROOT,
+ .values[2] = NULL,
+ .num_values = 2,
+ .existing_value = true,
+ .error_message = NULL
+ },{
+ .values[0] = VALUE_CURRENT_VERSION,
+ .values[1] = VALUE_SYSTEM_ROOT,
+ .values[2] = VALUE_CURRENT_VERSION,
+ .num_values = 3,
+ .existing_value = true,
+ .error_message = NULL
+ },{
+ .values[0] = VALUE_CURRENT_VERSION,
+ .values[1] = NULL,
+ .values[2] = VALUE_SYSTEM_ROOT,
+ .num_values = 3,
+ .existing_value = false,
+ .error_message = NULL
+ },{
+ .values[0] = VALUE_CURRENT_VERSION,
+ .values[1] = "",
+ .values[2] = VALUE_SYSTEM_ROOT,
+ .num_values = 3,
+ .existing_value = false,
+ .error_message = NULL
+ },{
+ .values[0] = "IDoNotExist",
+ .values[1] = NULL,
+ .values[2] = NULL,
+ .num_values = 1,
+ .existing_value = false,
+ .error_message = NULL
+ },{
+ .values[0] = "IDoNotExist",
+ .values[1] = VALUE_CURRENT_VERSION,
+ .values[2] = NULL,
+ .num_values = 2,
+ .existing_value = false,
+ .error_message = NULL
+ },{
+ .values[0] = VALUE_CURRENT_VERSION,
+ .values[1] = "IDoNotExist",
+ .values[2] = NULL,
+ .num_values = 2,
+ .existing_value = false,
+ .error_message = NULL
+ }
+};
+
static bool test_HKLM_wellknown(struct torture_context *tctx,
struct dcerpc_binding_handle *b,
struct policy_handle *handle)
{
struct policy_handle newhandle;
int i;
- static const struct {
- const char *values[3];
- uint32_t num_values;
- bool existing_value;
- const char *error_message;
- } multiple_values_tests[] = {
- {
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = NULL,
- .values[2] = NULL,
- .num_values = 1,
- .existing_value = true,
- .error_message = NULL
- },{
- .values[0] = VALUE_SYSTEM_ROOT,
- .values[1] = NULL,
- .values[2] = NULL,
- .num_values = 1,
- .existing_value = true,
- .error_message = NULL
- },{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = VALUE_SYSTEM_ROOT,
- .values[2] = NULL,
- .num_values = 2,
- .existing_value = true,
- .error_message = NULL
- },{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = VALUE_SYSTEM_ROOT,
- .values[2] = VALUE_CURRENT_VERSION,
- .num_values = 3,
- .existing_value = true,
- .error_message = NULL
- },{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = NULL,
- .values[2] = VALUE_SYSTEM_ROOT,
- .num_values = 3,
- .existing_value = false,
- .error_message = NULL
- },{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = "",
- .values[2] = VALUE_SYSTEM_ROOT,
- .num_values = 3,
- .existing_value = false,
- .error_message = NULL
- },{
- .values[0] = "IDoNotExist",
- .values[1] = NULL,
- .values[2] = NULL,
- .num_values = 1,
- .existing_value = false,
- .error_message = NULL
- },{
- .values[0] = "IDoNotExist",
- .values[1] = VALUE_CURRENT_VERSION,
- .values[2] = NULL,
- .num_values = 2,
- .existing_value = false,
- .error_message = NULL
- },{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = "IDoNotExist",
- .values[2] = NULL,
- .num_values = 2,
- .existing_value = false,
- .error_message = NULL
- }
- };
/* FIXME: s3 does not support SEC_FLAG_MAXIMUM_ALLOWED yet */
if (torture_setting_bool(tctx, "samba3", false)) {
--
Samba Shared Repository
