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

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  f9ed2ae s3: Fix a segfault in the printer code using 
create_conn_struct (cherry picked from commit 
6beb5563f3464cf32109c9069b39a5cf71134321)
      from  3a8b66c packaging: Build with -O3

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


- Log -----------------------------------------------------------------
commit f9ed2aec4982eeb589f580e75ee539d78b54d274
Author: Volker Lendecke <v...@samba.org>
Date:   Mon Aug 30 15:22:29 2010 +0200

    s3: Fix a segfault in the printer code using create_conn_struct
    (cherry picked from commit 6beb5563f3464cf32109c9069b39a5cf71134321)

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

Summary of changes:
 source3/smbd/conn.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index eaaddab..fffb5bf 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -321,7 +321,13 @@ void conn_free(connection_struct *conn)
 
        DLIST_REMOVE(conn->sconn->smb1.tcons.Connections, conn);
 
-       bitmap_clear(conn->sconn->smb1.tcons.bmap, conn->cnum);
+       if (conn->sconn->smb1.tcons.bmap != NULL) {
+               /*
+                * Can be NULL for fake connections created by
+                * create_conn_struct()
+                */
+               bitmap_clear(conn->sconn->smb1.tcons.bmap, conn->cnum);
+       }
 
        SMB_ASSERT(conn->sconn->smb1.tcons.num_open > 0);
        conn->sconn->smb1.tcons.num_open--;


-- 
Samba Shared Repository