The branch, master has been updated
via c3f1f6cac9fc92f373ec376824014c09c6760a0d (commit)
from ee059e33d5227a53f90b2cbb5977c5017e7cec49 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c3f1f6cac9fc92f373ec376824014c09c6760a0d
Author: Günther Deschner <[email protected]>
Date: Sun Jun 7 00:44:51 2009 +0200
s3-samr: remove total_data_size variable in _samr_QueryDisplayInfo.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srv_samr_nt.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 396365b..6e990a3 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1410,7 +1410,7 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
union samr_DispInfo *disp_info = r->out.info;
- uint32 temp_size=0, total_data_size=0;
+ uint32 temp_size=0;
NTSTATUS disp_ret = NT_STATUS_UNSUCCESSFUL;
uint32 num_account = 0;
enum remote_arch_types ra_type = get_remote_arch();
@@ -1591,9 +1591,6 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
if (!NT_STATUS_IS_OK(disp_ret))
return disp_ret;
- /* calculate the total size */
- total_data_size=num_account*struct_size;
-
if (max_entries <= num_account) {
status = STATUS_MORE_ENTRIES;
} else {
@@ -1605,7 +1602,7 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
DEBUG(5, ("_samr_QueryDisplayInfo: %d\n", __LINE__));
- *r->out.total_size = total_data_size;
+ *r->out.total_size = num_account * struct_size;
*r->out.returned_size = temp_size;
return status;
--
Samba Shared Repository
