[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1473-g599b9fe

[Günther Deschner]

The branch, master has been updated
       via  599b9fe86eba932171bb4ec13347ed28ea5edebd (commit)
      from  c52be9f6a0450d656671b4a756b3b5d56a88de24 (commit)

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


- Log -----------------------------------------------------------------
commit 599b9fe86eba932171bb4ec13347ed28ea5edebd
Author: Günther Deschner <g...@samba.org>
Date:   Thu May 7 14:19:43 2009 +0200

    s3-samr: Fix _samr_Connect5(). In error case it still needs to return empty 
info1.
    
    Guenther

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

Summary of changes:
 source3/rpc_server/srv_samr_nt.c |    3 ++-
 1 files changed, 2 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 a651cd2..677b593 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -3219,12 +3219,13 @@ NTSTATUS _samr_Connect5(pipes_struct *p,
        c.in.access_mask        = r->in.access_mask;
        c.out.connect_handle    = r->out.connect_handle;
 
+       *r->out.level_out = 1;
+
        status = _samr_Connect2(p, &c);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       *r->out.level_out = 1;
        r->out.info_out->info1 = info1;
 
        return NT_STATUS_OK;


-- 
Samba Shared Repository