[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Fri Sep 10 12:19:50 MDT 2010
The branch, master has been updated
via 55598c4 s4:torture/rpc/winreg.c - hopefully this attempt fixes Solaris "cc" on the buildfarm
via 4fc1319 s4:getncchanges_change_master - also in this call "i" needs to be unsigned
from 8de2c15 s3: auth.krb5ccname and auth.unix_username are both fstrings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 55598c4746f51f4a607c7b11e43ad56dcee22d87
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Fri Sep 10 19:28:07 2010 +0200
s4:torture/rpc/winreg.c - hopefully this attempt fixes Solaris "cc" on the buildfarm
The Solaris "cc" incompatiblity on this codepart seems to be harder to fix than
it looks like.
commit 4fc1319db9b27f97da94e6b15a93b7c10d60fa17
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Fri Sep 10 19:17:25 2010 +0200
s4:getncchanges_change_master - also in this call "i" needs to be unsigned
-----------------------------------------------------------------------
Summary of changes:
source4/rpc_server/drsuapi/getncchanges.c | 3 +-
source4/torture/rpc/winreg.c | 37 ++++++++---------------------
2 files changed, 12 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index 4d1e34d..fca87e7 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -921,7 +921,8 @@ static WERROR getncchanges_change_master(struct drsuapi_bind_state *b_state,
struct drsuapi_DsGetNCChangesCtr6 *ctr6)
{
struct ldb_dn *fsmo_role_dn, *req_dn, *ntds_dn;
- int ret, i;
+ int ret;
+ unsigned int i;
struct ldb_context *ldb = b_state->sam_ctx;
struct ldb_message *msg;
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index c2dd8b1..9cca02d 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2412,65 +2412,48 @@ static const struct {
const char *error_message;
} multiple_values_tests[] = {
{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = NULL,
- .values[2] = NULL,
+ .values = { VALUE_CURRENT_VERSION, NULL, NULL },
.num_values = 1,
.existing_value = true,
.error_message = NULL
},{
- .values[0] = VALUE_SYSTEM_ROOT,
- .values[1] = NULL,
- .values[2] = NULL,
+ .values = { VALUE_SYSTEM_ROOT, NULL, NULL },
.num_values = 1,
.existing_value = true,
.error_message = NULL
},{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = VALUE_SYSTEM_ROOT,
- .values[2] = NULL,
+ .values = { VALUE_CURRENT_VERSION, VALUE_SYSTEM_ROOT, 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,
+ .values = { VALUE_CURRENT_VERSION, VALUE_SYSTEM_ROOT,
+ 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,
+ .values = { VALUE_CURRENT_VERSION, NULL, VALUE_SYSTEM_ROOT },
.num_values = 3,
.existing_value = false,
.error_message = NULL
},{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = "",
- .values[2] = VALUE_SYSTEM_ROOT,
+ .values = { VALUE_CURRENT_VERSION, "", VALUE_SYSTEM_ROOT },
.num_values = 3,
.existing_value = false,
.error_message = NULL
},{
- .values[0] = "IDoNotExist",
- .values[1] = NULL,
- .values[2] = NULL,
+ .values = { "IDoNotExist", NULL, NULL },
.num_values = 1,
.existing_value = false,
.error_message = NULL
},{
- .values[0] = "IDoNotExist",
- .values[1] = VALUE_CURRENT_VERSION,
- .values[2] = NULL,
+ .values = { "IDoNotExist", VALUE_CURRENT_VERSION, NULL },
.num_values = 2,
.existing_value = false,
.error_message = NULL
},{
- .values[0] = VALUE_CURRENT_VERSION,
- .values[1] = "IDoNotExist",
- .values[2] = NULL,
+ .values = { VALUE_CURRENT_VERSION, "IDoNotExist", NULL },
.num_values = 2,
.existing_value = false,
.error_message = NULL
--
Samba Shared Repository
More information about the samba-cvs
mailing list