[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1312-gf8cc0e8

[Bo Yang]

The branch, master has been updated
       via  f8cc0e88fbbb082ead023e0cb437b1e12cf35459 (commit)
      from  077bcc11257697b243916fbb02cd72b3a122b9ba (commit)

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


- Log -----------------------------------------------------------------
commit f8cc0e88fbbb082ead023e0cb437b1e12cf35459
Author: Bo Yang <boy...@novell.com>
Date:   Wed Apr 29 09:50:41 2009 +0800

    s3: fix crash in winbindd

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

Summary of changes:
 source3/libsmb/async_smb.c            |    4 ++++
 source3/rpc_client/rpc_transport_np.c |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 6faf96c..17040b8 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -604,6 +604,10 @@ bool cli_smb_req_send(struct tevent_req *req)
        struct cli_smb_state *state = tevent_req_data(
                req, struct cli_smb_state);
 
+       if (state->cli->fd == -1) {
+               return false;
+       }
+
        return cli_smb_req_iov_send(req, state, state->iov, state->iov_count);
 }
 
diff --git a/source3/rpc_client/rpc_transport_np.c 
b/source3/rpc_client/rpc_transport_np.c
index 40d68dd..dceacf6 100644
--- a/source3/rpc_client/rpc_transport_np.c
+++ b/source3/rpc_client/rpc_transport_np.c
@@ -31,6 +31,12 @@ struct rpc_transport_np_state {
 static int rpc_transport_np_state_destructor(struct rpc_transport_np_state *s)
 {
        bool ret;
+
+       if (s->cli->fd == -1) {
+               DEBUG(10, ("socket was closed, no need to send close 
request.\n"));
+               return 0;
+       }
+       
        ret = cli_close(s->cli, s->fnum);
        if (!ret) {
                DEBUG(1, ("rpc_transport_np_state_destructor: cli_close "


-- 
Samba Shared Repository