[SCM] Samba Shared Repository - branch v3-5-test updated

[Bo Yang]

The branch, v3-5-test has been updated
       via  3c4f74b... s3: Fix crash in winbindd;(bug#6879).
      from  baa4727... Remove unneeded argument from can_set_delete_on_close(). 
Ensure can_set_delete_on_close() is correctly called before any setting of the 
disposition bit (clean up the do_unlink() call). Jeremy. (cherry picked from 
commit dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6)

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


- Log -----------------------------------------------------------------
commit 3c4f74bbcbe7c9c7e50865adac2db70e48a2d82f
Author: Bo Yang <boy...@samba.org>
Date:   Fri Dec 4 12:53:38 2009 +0800

    s3: Fix crash in winbindd;(bug#6879).
    
    Signed-off-by: Bo Yang <boy...@samba.org>
    (cherry picked from commit cdb68bd2b61147df77b7f2de3fb4e29be07e7bd9)

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

Summary of changes:
 source3/winbindd/winbindd_rpc.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index d4e2ff2..b6cb56e 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -1276,8 +1276,12 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
         * This call can take a long time
         * allow the server to time out.
         * 35 seconds should do it.
+        * NB
+        * only do this when the undelying transport is named pipe.
         */
-       orig_timeout = rpccli_set_timeout(cli, 35000);
+       if (cli->transport->transport == NCACN_NP) {
+               orig_timeout = rpccli_set_timeout(cli, 35000);
+       }
 
        status = lookup_names_fn(cli,
                                 mem_ctx,
@@ -1290,7 +1294,9 @@ NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
                                 types);
 
        /* And restore our original timeout. */
-       rpccli_set_timeout(cli, orig_timeout);
+       if (cli->transport->transport == NCACN_NP) {
+               rpccli_set_timeout(cli, orig_timeout);
+       }
 
        if (!NT_STATUS_IS_OK(status)) {
                return status;


-- 
Samba Shared Repository