The branch, v3-6-test has been updated
via df22e63 s3:utils/net_*registry: use c99 initializers which are
supported by old gcc 2.95 compilers (bug #8226)
from 4a9a11c s3:libsmb/clireadwrite: calculate cli_write_max_bufsize()
correct based on max_xmit
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit df22e635f51d3423e8e8a810de57270b3c13edd3
Author: Stefan Metzmacher <[email protected]>
Date: Wed Jun 15 02:34:53 2011 +0200
s3:utils/net_*registry: use c99 initializers which are supported by old gcc
2.95 compilers (bug #8226)
metze
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Wed Jun 15 03:48:41 CEST 2011 on sn-devel-104
(cherry picked from commit 5d736d87778754de7043d902c7d1d5db1c46cb02)
-----------------------------------------------------------------------
Summary of changes:
source3/utils/net_registry.c | 8 +++++---
source3/utils/net_rpc_registry.c | 4 +++-
2 files changed, 8 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 19405e2..dcc88a9 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -958,9 +958,11 @@ static int net_registry_import(struct net_context *c, int
argc,
.createkey =
(reg_import_callback_createkey_t)&import_create_key,
.deletekey =
(reg_import_callback_deletekey_t)&import_delete_key,
.deleteval =
(reg_import_callback_deleteval_t)&import_delete_val,
- .setval.registry_value =
(reg_import_callback_setval_registry_value_t)
- &import_create_val,
- .setval_type = REGISTRY_VALUE,
+ .setval = {
+ .registry_value =
(reg_import_callback_setval_registry_value_t)
+ &import_create_val,
+ },
+ .setval_type = REGISTRY_VALUE,
.data = &import_ctx
};
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 20a6bda..dde129f 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -1959,7 +1959,9 @@ static NTSTATUS rpc_registry_import_internal(struct
net_context *c,
.createkey =
(reg_import_callback_createkey_t)&import_create_key,
.deletekey =
(reg_import_callback_deletekey_t)&import_delete_key,
.deleteval =
(reg_import_callback_deleteval_t)&import_delete_val,
- .setval.blob =
(reg_import_callback_setval_blob_t)&import_create_val,
+ .setval = {
+ .blob =
(reg_import_callback_setval_blob_t)&import_create_val,
+ },
.setval_type = BLOB,
.data = &import_ctx
};
--
Samba Shared Repository
