[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2101-g93e7970

[Günther Deschner]

The branch, master has been updated
       via  93e797064753e815a3fe5e32fdea167b395b58d3 (commit)
      from  c3f1f6cac9fc92f373ec376824014c09c6760a0d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 93e797064753e815a3fe5e32fdea167b395b58d3
Author: Günther Deschner <gd at samba.org>
Date:   Sun Jun 7 00:47:03 2009 +0200

    s3-samr: fix _QueryDisplayInformation r->out.returned_size.
    
    *r->out.returned_size needs to be 0 if nothing was enumerated.
    
    Found by RPC-SAMR torture test.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/srv_samr_nt.c |    2 +-
 1 files changed, 1 insertions(+), 1 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 6e990a3..e2f65ae 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1603,7 +1603,7 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
 	DEBUG(5, ("_samr_QueryDisplayInfo: %d\n", __LINE__));
 
 	*r->out.total_size = num_account * struct_size;
-	*r->out.returned_size = temp_size;
+	*r->out.returned_size = num_account ? temp_size : 0;
 
 	return status;
 }


-- 
Samba Shared Repository