Changeset 274 for branches/samba-3.3.x/source/smbd/uid.c

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

File:

• branches/samba-3.3.x/source/smbd/uid.c (modified) (5 diffs)

branches/samba-3.3.x/source/smbd/uid.c

@@ -55 +55 @@
 }
 
+/****************************************************************************
+ talloc free the conn->server_info if not used in the vuid cache.
+****************************************************************************/
+
+static void free_conn_server_info_if_unused(connection_struct *conn)
+{
+        unsigned int i;
+
+        for (i = 0; i < VUID_CACHE_SIZE; i++) {
+                struct vuid_cache_entry *ent;
+                ent = &conn->vuid_cache.array[i];
+                if (ent->vuid != UID_FIELD_INVALID &&
+                                conn->server_info == ent->server_info) {
+                        return;
+                }
+        }
+        /* Not used, safe to free. */
+        TALLOC_FREE(conn->server_info);
+}
+
 /*******************************************************************
  Check if a username is OK.
@@ -78 +98 @@
                         ent = &conn->vuid_cache.array[i];
                         if (ent->vuid == vuid) {
+                                free_conn_server_info_if_unused(conn);
                                 conn->server_info = ent->server_info;
                                 conn->read_only = ent->read_only;
@@ -143 +164 @@
                 ent->read_only = readonly_share;
                 ent->admin_user = admin_user;
+                free_conn_server_info_if_unused(conn);
                 conn->server_info = ent->server_info;
         }
@@ -154 +176 @@
 /****************************************************************************
  Clear a vuid out of the connection's vuid cache
+ This is only called on SMBulogoff.
 ****************************************************************************/
 
@@ -167 +190 @@
                 if (ent->vuid == vuid) {
                         ent->vuid = UID_FIELD_INVALID;
-                        /* Ensure we're not freeing an active pointer. */
+                        /*
+                         * We need to keep conn->server_info around
+                         * if it's equal to ent->server_info as a SMBulogoff
+                         * is often followed by a SMBtdis (with an invalid
+                         * vuid). The debug code (or regular code in
+                         * vfs_full_audit) wants to refer to the
+                         * conn->server_info pointer to print debug
+                         * statements. Theoretically this is a bug,
+                         * as once the vuid is gone the server_info
+                         * on the conn struct isn't valid any more,
+                         * but there's enough code that assumes
+                         * conn->server_info is never null that
+                         * it's easier to hold onto the old pointer
+                         * until we get a new sessionsetupX.
+                         * As everything is hung off the
+                         * conn pointer as a talloc context we're not
+                         * leaking memory here. See bug #6315. JRA.
+                         */
                         if (conn->server_info == ent->server_info) {
-                                conn->server_info = NULL;
+                                ent->server_info = NULL;
+                        } else {
+                                TALLOC_FREE(ent->server_info);
                         }
-                        TALLOC_FREE(ent->server_info);
                         ent->read_only = False;
                         ent->admin_user = False;