Changeset 233 for branches/samba-3.2.x/source/lib/messages.c

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

File:

• branches/samba-3.2.x/source/lib/messages.c (modified) (3 diffs)

branches/samba-3.2.x/source/lib/messages.c

@@ -279 +279 @@
 
         for (cb = msg_ctx->callbacks; cb != NULL; cb = cb->next) {
-                if (cb->msg_type == msg_type) {
+                /* we allow a second registration of the same message
+                   type if it has a different private pointer. This is
+                   needed in, for example, the internal notify code,
+                   which creates a new notify context for each tree
+                   connect, and expects to receive messages to each of
+                   them. */
+                if (cb->msg_type == msg_type && private_data == cb->private_data) {
+                        DEBUG(5,("Overriding messaging pointer for type %u - private_data=%p\n",
+                                  (unsigned)msg_type, private_data));
                         cb->fn = fn;
                         cb->private_data = private_data;
@@ -310 +318 @@
                 if ((cb->msg_type == msg_type)
                     && (cb->private_data == private_data)) {
+                        DEBUG(5,("Deregistering messaging pointer for type %u - private_data=%p\n",
+                                  (unsigned)msg_type, private_data));
                         DLIST_REMOVE(ctx->callbacks, cb);
                         TALLOC_FREE(cb);
@@ -355 +365 @@
                         cb->fn(msg_ctx, cb->private_data, rec->msg_type,
                                rec->src, &rec->buf);
-                        return;
+                        /* we continue looking for matching messages
+                           after finding one. This matters for
+                           subsystems like the internal notify code
+                           which register more than one handler for
+                           the same message type */
                 }
         }