[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-898-g48818f8

[Günther Deschner]

The branch, v3-4-test has been updated
       via  48818f8e5ebd64efa9fd26508422db7feba7dc25 (commit)
      from  2ea00bf3a65c76211a42d29adfa3f71e06c813e8 (commit)

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


- Log -----------------------------------------------------------------
commit 48818f8e5ebd64efa9fd26508422db7feba7dc25
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
    (cherry picked from commit 599b9fe86eba932171bb4ec13347ed28ea5edebd)

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

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 165fb17..44c4ed4 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -3337,12 +3337,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