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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

Location:

branches/samba-3.2.x/source/lib

Files:

• dbwrap.c (modified) (1 diff)
• interface.c (modified) (2 diffs)
• interfaces.c (modified) (1 diff)
• messages.c (modified) (3 diffs)
• netapi/user.c (modified) (2 diffs)
• replace/libreplace_ld.m4 (modified) (1 diff)
• util.c (modified) (2 diffs)

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

@@ -43 +43 @@
 }
 
+bool db_is_local(const char *name)
+{
+#ifdef CLUSTER_SUPPORT
+        const char *sockname = lp_ctdbd_socket();
+
+        if(!sockname || !*sockname) {
+                sockname = CTDB_PATH;
+        }
+
+        if (lp_clustering() && socket_exist(sockname)) {
+                const char *partname;
+                /* ctdb only wants the file part of the name */
+                partname = strrchr(name, '/');
+                if (partname) {
+                        partname++;
+                } else {
+                        partname = name;
+                }
+                /* allow ctdb for individual databases to be disabled */
+                if (lp_parm_bool(-1, "ctdb", partname, True)) {
+                        return false;
+                }
+        }
+#endif
+        return true;
+}
+
 /**
  * If you need transaction support use db_open_trans()

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

@@ -152 +152 @@
 
 /****************************************************************************
- Return a pointer to the in_addr of the first IPv4 interface.
+ Return a pointer to the in_addr of the first IPv4 interface that's
+ not 0.0.0.0.
 **************************************************************************/
 
@@ -160 +161 @@
 
         for (i=local_interfaces;i ;i=i->next) {
-                if (i->ip.ss_family == AF_INET) {
+                if ((i->ip.ss_family == AF_INET) &&
+                    (!is_zero_ip_v4(((struct sockaddr_in *)&i->ip)->sin_addr)))
+                {
                         break;
                 }

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

branches/samba-3.2.x/source/lib/netapi/user.c

@@ -900 +900 @@
         NTSTATUS status;
         WERROR werr;
+        WERROR werr_tmp;
+
+        *r->out.entries_read = 0;
 
         ZERO_STRUCT(connect_handle);
@@ -993 +996 @@
                                                &returned_size,
                                                &info);
-        if (!NT_STATUS_IS_OK(status)) {
-                werr = ntstatus_to_werror(status);
-                goto done;
-        }
-
-        werr = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
-                                                    r->in.level,
-                                                    r->out.entries_read,
-                                                    r->out.buffer);
+        werr = ntstatus_to_werror(status);
+        if (NT_STATUS_IS_ERR(status)) {
+                goto done;
+        }
+
+        werr_tmp = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
+                                                        r->in.level,
+                                                        r->out.entries_read,
+                                                        r->out.buffer);
+        if (!W_ERROR_IS_OK(werr_tmp)) {
+                werr = werr_tmp;
+        }
  done:
         if (!cli) {

branches/samba-3.2.x/source/lib/replace/libreplace_ld.m4

@@ -293 +293 @@
                         LIB_PATH_VAR=LD_LIBRARY_PATH
                 ;;
-                *netbsd*)
+                *bsd*)
                         LIB_PATH_VAR=LD_LIBRARY_PATH
                 ;;

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

@@ -1058 +1058 @@
         }
 
+        if (ev_ctx) {
+                event_context_reinit(ev_ctx);
+        }
+
         if (msg_ctx) {
                 /*
@@ -1069 +1073 @@
                         return false;
                 }
-        }
-
-        if (ev_ctx) {
-                event_context_reinit(ev_ctx);
         }