[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-699-ga1513ce

[Günther Deschner]

The branch, v3-4-test has been updated
       via  a1513ce0851a64df0d80306b13e0ebd2fbfe28ce (commit)
      from  75fbdebda09c1f6029194234cd9f5275a096bce7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit a1513ce0851a64df0d80306b13e0ebd2fbfe28ce
Author: Günther Deschner <g...@samba.org>
Date:   Wed Apr 8 23:21:41 2009 +0200

    s3-svcctl: Fix _svcctl_EnumServicesStatusW (again).
    
    The final plan is to use the same macro based code that we have in spoolss 
to
    handle the buffers and calculate the buffer-sizes.
    
    Guenther
    (cherry picked from commit d8a6ea8141fba4876b6674806b629748ecf41876)

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

Summary of changes:
 source3/rpc_server/srv_svcctl_nt.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_svcctl_nt.c 
b/source3/rpc_server/srv_svcctl_nt.c
index ddfe0df..1850dcb 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -466,9 +466,7 @@ WERROR _svcctl_EnumServicesStatusW(pipes_struct *p,
                }
 
                blob = ndr_push_blob(ndr);
-               if (blob.length >= r->in.offered) {
-                       memcpy(r->out.service, blob.data, r->in.offered);
-               }
+               memcpy(r->out.service, blob.data, r->in.offered);
        }
 
        *r->out.needed                  = (buffer_size > r->in.offered) ? 
buffer_size : r->in.offered;


-- 
Samba Shared Repository