Changeset 222 for branches/samba-3.3.x/source/lib

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

Location:

branches/samba-3.3.x/source/lib

Files:

• fault.c (modified) (1 diff)
• interfaces.c (modified) (1 diff)
• messages.c (modified) (3 diffs)

branches/samba-3.3.x/source/lib/fault.c

@@ -162 +162 @@
         }
 
-        SAFE_FREE(corepath);
         SAFE_FREE(logbase);
 

branches/samba-3.3.x/source/lib/interfaces.c

@@ -19 +19 @@
 */
 
-
-/* working out the interfaces for a OS is an incredibly non-portable
-   thing. We have several possible implementations below, and autoconf
-   tries each of them to see what works
-
-   Note that this file does _not_ include includes.h. That is so this code
-   can be called directly from the autoconf tests. That also means
-   this code cannot use any of the normal Samba debug stuff or defines.
-   This is standalone code.
-
-*/
-
-#ifndef AUTOCONF_TEST
-#include "config.h"
-#endif
-
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifdef HAVE_IFADDRS_H
-#include <ifaddrs.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifndef SIOCGIFCONF
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#ifdef __COMPAR_FN_T
-#define QSORT_CAST (__compar_fn_t)
-#endif
-
-#ifndef QSORT_CAST
-#define QSORT_CAST (int (*)(const void *, const void *))
-#endif
-
-#ifdef HAVE_NET_IF_H
-#include <net/if.h>
-#endif
-
-#define SOCKET_WRAPPER_NOT_REPLACE
-#include "interfaces.h"
-#include "lib/replace/replace.h"
-
-/****************************************************************************
- Utility functions.
-****************************************************************************/
+#include "includes.h"
 
 /****************************************************************************

branches/samba-3.3.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 */
                 }
         }