[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-0pre2-2022-g1c8be8e
Karolin Seeger
kseeger at samba.org
Fri Apr 25 10:38:01 GMT 2008
The branch, v3-2-stable has been updated
via 1c8be8e90a6aba639e6ac6bf5ffb50054970ebf9 (commit)
from be95b548ee0c0c14ce27cadea0f3030b70b43b80 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 1c8be8e90a6aba639e6ac6bf5ffb50054970ebf9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Apr 25 10:22:03 2008 +0100
Rerun pidl after fixing array copying in client code and authservice array sizes.
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/cli_echo.c | 4 ++--
source/librpc/gen_ndr/cli_epmapper.c | 4 ++--
source/librpc/gen_ndr/cli_eventlog.c | 2 +-
source/librpc/gen_ndr/cli_srvsvc.c | 2 +-
source/librpc/gen_ndr/cli_svcctl.c | 20 ++++++++++----------
source/librpc/gen_ndr/cli_winreg.c | 8 ++++----
source/librpc/gen_ndr/ndr_dfs.c | 2 +-
source/librpc/gen_ndr/ndr_dssetup.c | 2 +-
source/librpc/gen_ndr/ndr_echo.c | 2 +-
source/librpc/gen_ndr/ndr_epmapper.c | 2 +-
source/librpc/gen_ndr/ndr_lsa.c | 2 +-
source/librpc/gen_ndr/ndr_netlogon.c | 2 +-
source/librpc/gen_ndr/ndr_samr.c | 2 +-
source/librpc/gen_ndr/ndr_srvsvc.c | 2 +-
source/librpc/gen_ndr/ndr_svcctl.c | 2 +-
source/librpc/gen_ndr/ndr_winreg.c | 2 +-
source/librpc/gen_ndr/ndr_wkssvc.c | 2 +-
17 files changed, 31 insertions(+), 31 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_echo.c b/source/librpc/gen_ndr/cli_echo.c
index addeef6..23a8907 100644
--- a/source/librpc/gen_ndr/cli_echo.c
+++ b/source/librpc/gen_ndr/cli_echo.c
@@ -84,7 +84,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(out_data, r.out.out_data, r.in.len);
+ memcpy(out_data, r.out.out_data, r.in.len * sizeof(*out_data));
/* Return result */
return NT_STATUS_OK;
@@ -166,7 +166,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(data, r.out.data, r.in.len);
+ memcpy(data, r.out.data, r.in.len * sizeof(*data));
/* Return result */
return NT_STATUS_OK;
diff --git a/source/librpc/gen_ndr/cli_epmapper.c b/source/librpc/gen_ndr/cli_epmapper.c
index 5a91f05..39a695d 100644
--- a/source/librpc/gen_ndr/cli_epmapper.c
+++ b/source/librpc/gen_ndr/cli_epmapper.c
@@ -138,7 +138,7 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
/* Return variables */
*entry_handle = *r.out.entry_handle;
*num_ents = *r.out.num_ents;
- memcpy(entries, r.out.entries, r.in.max_ents);
+ memcpy(entries, r.out.entries, r.in.max_ents * sizeof(*entries));
/* Return result */
return NT_STATUS_OK;
@@ -188,7 +188,7 @@ NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
/* Return variables */
*entry_handle = *r.out.entry_handle;
*num_towers = *r.out.num_towers;
- memcpy(towers, r.out.towers, r.in.max_towers);
+ memcpy(towers, r.out.towers, r.in.max_towers * sizeof(*towers));
/* Return result */
return NT_STATUS_OK;
diff --git a/source/librpc/gen_ndr/cli_eventlog.c b/source/librpc/gen_ndr/cli_eventlog.c
index 795995f..e186719 100644
--- a/source/librpc/gen_ndr/cli_eventlog.c
+++ b/source/librpc/gen_ndr/cli_eventlog.c
@@ -446,7 +446,7 @@ NTSTATUS rpccli_eventlog_ReadEventLogW(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(data, r.out.data, r.in.number_of_bytes);
+ memcpy(data, r.out.data, r.in.number_of_bytes * sizeof(*data));
*sent_size = *r.out.sent_size;
*real_size = *r.out.real_size;
diff --git a/source/librpc/gen_ndr/cli_srvsvc.c b/source/librpc/gen_ndr/cli_srvsvc.c
index 291e3ef..f611386 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.c
+++ b/source/librpc/gen_ndr/cli_srvsvc.c
@@ -1663,7 +1663,7 @@ NTSTATUS rpccli_srvsvc_NetPathCanonicalize(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(can_path, r.out.can_path, r.in.maxbuf);
+ memcpy(can_path, r.out.can_path, r.in.maxbuf * sizeof(*can_path));
*pathtype = *r.out.pathtype;
/* Return result */
diff --git a/source/librpc/gen_ndr/cli_svcctl.c b/source/librpc/gen_ndr/cli_svcctl.c
index eadf88f..4065044 100644
--- a/source/librpc/gen_ndr/cli_svcctl.c
+++ b/source/librpc/gen_ndr/cli_svcctl.c
@@ -230,7 +230,7 @@ NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(buffer, r.out.buffer, r.in.buffer_size);
+ memcpy(buffer, r.out.buffer, r.in.buffer_size * sizeof(*buffer));
*needed = *r.out.needed;
/* Return result */
@@ -759,7 +759,7 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(service, r.out.service, r.in.buf_size);
+ memcpy(service, r.out.service, r.in.buf_size * sizeof(*service));
*bytes_needed = *r.out.bytes_needed;
*services_returned = *r.out.services_returned;
if (resume_handle && r.out.resume_handle) {
@@ -913,7 +913,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(query, r.out.query, r.in.buf_size);
+ memcpy(query, r.out.query, r.in.buf_size * sizeof(*query));
*bytes_needed = *r.out.bytes_needed;
/* Return result */
@@ -1414,7 +1414,7 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(service, r.out.service, r.in.buf_size);
+ memcpy(service, r.out.service, r.in.buf_size * sizeof(*service));
*bytes_needed = *r.out.bytes_needed;
*services_returned = *r.out.services_returned;
if (resume_handle && r.out.resume_handle) {
@@ -1566,7 +1566,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(query, r.out.query, r.in.buf_size);
+ memcpy(query, r.out.query, r.in.buf_size * sizeof(*query));
*bytes_needed = *r.out.bytes_needed;
/* Return result */
@@ -2002,7 +2002,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(buffer, r.out.buffer, r.in.buf_size);
+ memcpy(buffer, r.out.buffer, r.in.buf_size * sizeof(*buffer));
*bytes_needed = *r.out.bytes_needed;
/* Return result */
@@ -2054,7 +2054,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(buffer, r.out.buffer, r.in.buf_size);
+ memcpy(buffer, r.out.buffer, r.in.buf_size * sizeof(*buffer));
*bytes_needed = *r.out.bytes_needed;
/* Return result */
@@ -2106,7 +2106,7 @@ NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(buffer, r.out.buffer, r.in.buf_size);
+ memcpy(buffer, r.out.buffer, r.in.buf_size * sizeof(*buffer));
*bytes_needed = *r.out.bytes_needed;
/* Return result */
@@ -2166,7 +2166,7 @@ NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(services, r.out.services, r.in.buf_size);
+ memcpy(services, r.out.services, r.in.buf_size * sizeof(*services));
*bytes_needed = *r.out.bytes_needed;
*service_returned = *r.out.service_returned;
if (resume_handle && r.out.resume_handle) {
@@ -2231,7 +2231,7 @@ NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(services, r.out.services, r.in.buf_size);
+ memcpy(services, r.out.services, r.in.buf_size * sizeof(*services));
*bytes_needed = *r.out.bytes_needed;
*service_returned = *r.out.service_returned;
if (resume_handle && r.out.resume_handle) {
diff --git a/source/librpc/gen_ndr/cli_winreg.c b/source/librpc/gen_ndr/cli_winreg.c
index b7cfffe..af0e47d 100644
--- a/source/librpc/gen_ndr/cli_winreg.c
+++ b/source/librpc/gen_ndr/cli_winreg.c
@@ -555,7 +555,7 @@ NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli,
*type = *r.out.type;
}
if (value && r.out.value) {
- memcpy(value, r.out.value, *r.in.size);
+ memcpy(value, r.out.value, *r.in.size * sizeof(*value));
}
if (size && r.out.size) {
*size = *r.out.size;
@@ -933,7 +933,7 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
*type = *r.out.type;
}
if (data && r.out.data) {
- memcpy(data, r.out.data, *r.in.data_size);
+ memcpy(data, r.out.data, *r.in.data_size * sizeof(*data));
}
if (data_size && r.out.data_size) {
*data_size = *r.out.data_size;
@@ -1511,9 +1511,9 @@ NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(values, r.out.values, r.in.num_values);
+ memcpy(values, r.out.values, r.in.num_values * sizeof(*values));
if (buffer && r.out.buffer) {
- memcpy(buffer, r.out.buffer, *r.in.buffer_size);
+ memcpy(buffer, r.out.buffer, *r.in.buffer_size * sizeof(*buffer));
}
*buffer_size = *r.out.buffer_size;
diff --git a/source/librpc/gen_ndr/ndr_dfs.c b/source/librpc/gen_ndr/ndr_dfs.c
index 2e9873e..1897550 100644
--- a/source/librpc/gen_ndr/ndr_dfs.c
+++ b/source/librpc/gen_ndr/ndr_dfs.c
@@ -5781,7 +5781,7 @@ static const char * const netdfs_authservice_strings[] = {
};
static const struct ndr_interface_string_array netdfs_authservices = {
- .count = 3,
+ .count = 1,
.names = netdfs_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_dssetup.c b/source/librpc/gen_ndr/ndr_dssetup.c
index bdad3c4..0c02784 100644
--- a/source/librpc/gen_ndr/ndr_dssetup.c
+++ b/source/librpc/gen_ndr/ndr_dssetup.c
@@ -1062,7 +1062,7 @@ static const char * const dssetup_authservice_strings[] = {
};
static const struct ndr_interface_string_array dssetup_authservices = {
- .count = 4,
+ .count = 1,
.names = dssetup_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_echo.c b/source/librpc/gen_ndr/ndr_echo.c
index 340167c..83b5fa1 100644
--- a/source/librpc/gen_ndr/ndr_echo.c
+++ b/source/librpc/gen_ndr/ndr_echo.c
@@ -1493,7 +1493,7 @@ static const char * const rpcecho_authservice_strings[] = {
};
static const struct ndr_interface_string_array rpcecho_authservices = {
- .count = 3,
+ .count = 1,
.names = rpcecho_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_epmapper.c b/source/librpc/gen_ndr/ndr_epmapper.c
index 2e709e1..ba2f7bd 100644
--- a/source/librpc/gen_ndr/ndr_epmapper.c
+++ b/source/librpc/gen_ndr/ndr_epmapper.c
@@ -2679,7 +2679,7 @@ static const char * const epmapper_authservice_strings[] = {
};
static const struct ndr_interface_string_array epmapper_authservices = {
- .count = 3,
+ .count = 1,
.names = epmapper_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_lsa.c b/source/librpc/gen_ndr/ndr_lsa.c
index 750fc08..c7d428b 100644
--- a/source/librpc/gen_ndr/ndr_lsa.c
+++ b/source/librpc/gen_ndr/ndr_lsa.c
@@ -12527,7 +12527,7 @@ static const char * const lsarpc_authservice_strings[] = {
};
static const struct ndr_interface_string_array lsarpc_authservices = {
- .count = 5,
+ .count = 1,
.names = lsarpc_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_netlogon.c b/source/librpc/gen_ndr/ndr_netlogon.c
index f8803cc..ce61f8d 100644
--- a/source/librpc/gen_ndr/ndr_netlogon.c
+++ b/source/librpc/gen_ndr/ndr_netlogon.c
@@ -15085,7 +15085,7 @@ static const char * const netlogon_authservice_strings[] = {
};
static const struct ndr_interface_string_array netlogon_authservices = {
- .count = 3,
+ .count = 1,
.names = netlogon_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index 46b3a07..db95ec3 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -12656,7 +12656,7 @@ static const char * const samr_authservice_strings[] = {
};
static const struct ndr_interface_string_array samr_authservices = {
- .count = 3,
+ .count = 1,
.names = samr_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_srvsvc.c b/source/librpc/gen_ndr/ndr_srvsvc.c
index 4e9e81a..7e2df4c 100644
--- a/source/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source/librpc/gen_ndr/ndr_srvsvc.c
@@ -19634,7 +19634,7 @@ static const char * const srvsvc_authservice_strings[] = {
};
static const struct ndr_interface_string_array srvsvc_authservices = {
- .count = 3,
+ .count = 1,
.names = srvsvc_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_svcctl.c b/source/librpc/gen_ndr/ndr_svcctl.c
index 16e0416..8ceb6b0 100644
--- a/source/librpc/gen_ndr/ndr_svcctl.c
+++ b/source/librpc/gen_ndr/ndr_svcctl.c
@@ -5998,7 +5998,7 @@ static const char * const svcctl_authservice_strings[] = {
};
static const struct ndr_interface_string_array svcctl_authservices = {
- .count = 2,
+ .count = 1,
.names = svcctl_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_winreg.c b/source/librpc/gen_ndr/ndr_winreg.c
index 3301dd3..0a53947 100644
--- a/source/librpc/gen_ndr/ndr_winreg.c
+++ b/source/librpc/gen_ndr/ndr_winreg.c
@@ -4522,7 +4522,7 @@ static const char * const winreg_authservice_strings[] = {
};
static const struct ndr_interface_string_array winreg_authservices = {
- .count = 3,
+ .count = 1,
.names = winreg_authservice_strings
};
diff --git a/source/librpc/gen_ndr/ndr_wkssvc.c b/source/librpc/gen_ndr/ndr_wkssvc.c
index 80ea675..d3870da 100644
--- a/source/librpc/gen_ndr/ndr_wkssvc.c
+++ b/source/librpc/gen_ndr/ndr_wkssvc.c
@@ -10659,7 +10659,7 @@ static const char * const wkssvc_authservice_strings[] = {
};
static const struct ndr_interface_string_array wkssvc_authservices = {
- .count = 3,
+ .count = 1,
.names = wkssvc_authservice_strings
};
--
Samba Shared Repository
More information about the samba-cvs
mailing list