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

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

Location:

branches/samba-3.2.x/source/lib

Files:

• interface.c (modified) (2 diffs)
• tdb/common/io.c (modified) (1 diff)
• tdb/common/transaction.c (modified) (1 diff)
• time.c (modified) (2 diffs)
• util_sock.c (modified) (1 diff)
• util_str.c (modified) (3 diffs)

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

@@ -132 +132 @@
 
 /****************************************************************************
- How many interfaces do we have (v4 only) ?
-**************************************************************************/
-
-int iface_count_v4(void)
+ How many non-loopback IPv4 interfaces do we have ?
+**************************************************************************/
+
+int iface_count_v4_nl(void)
 {
         int ret = 0;
@@ -141 +141 @@
 
         for (i=local_interfaces;i;i=i->next) {
+                if (is_loopback_addr(&i->ip)) {
+                        continue;
+                }
                 if (i->ip.ss_family == AF_INET) {
                         ret++;

branches/samba-3.2.x/source/lib/tdb/common/io.c

@@ -208 +208 @@
 #ifdef HAVE_MMAP
         if (tdb->map_ptr) {
-                int ret = munmap(tdb->map_ptr, tdb->map_size);
+                int ret;
+
+                ret = munmap(tdb->map_ptr, tdb->map_size);
                 if (ret != 0)
                         return ret;

branches/samba-3.2.x/source/lib/tdb/common/transaction.c

@@ -569 +569 @@
                 return -1;
         }
-#ifdef MS_SYNC
+#ifdef HAVE_MMAP
         if (tdb->map_ptr) {
                 tdb_off_t moffset = offset & ~(tdb->page_size-1);

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

@@ -827 +827 @@
 ****************************************************************************/
 
-time_t get_create_time(const SMB_STRUCT_STAT *st,bool fake_dirs)
+static time_t calc_create_time(const SMB_STRUCT_STAT *st)
 {
         time_t ret, ret1;
 
-        if(S_ISDIR(st->st_mode) && fake_dirs) {
-                return (time_t)315493200L;          /* 1/1/1980 */
-        }
-    
         ret = MIN(st->st_ctime, st->st_mtime);
         ret1 = MIN(ret, st->st_atime);
@@ -849 +845 @@
 }
 
-struct timespec get_create_timespec(const SMB_STRUCT_STAT *st,bool fake_dirs)
-{
-        struct timespec ts;
-        ts.tv_sec = get_create_time(st, fake_dirs);
-        ts.tv_nsec = 0;
-        return ts;
+/****************************************************************************
+ Return the 'create time' from a stat struct if it exists (birthtime) or else
+ use the best approximation.
+****************************************************************************/
+
+struct timespec get_create_timespec(const SMB_STRUCT_STAT *pst,bool fake_dirs)
+{
+        struct timespec ret;
+
+        if(S_ISDIR(pst->st_mode) && fake_dirs) {
+                ret.tv_sec = 315493200L;          /* 1/1/1980 */
+                ret.tv_nsec = 0;
+                return ret;
+        }
+
+#if defined(HAVE_STAT_ST_BIRTHTIMESPEC)
+        ret = pst->st_birthtimespec;
+#elif defined(HAVE_STAT_ST_BIRTHTIMENSEC)
+        ret.tv_sec = pst->st_birthtime;
+        ret.tv_nsec = pst->st_birthtimenspec;
+#elif defined(HAVE_STAT_ST_BIRTHTIME)
+        ret.tv_sec = pst->st_birthtime;
+        ret.tv_nsec = 0;
+#else
+        ret.tv_sec = calc_create_time(pst);
+        ret.tv_nsec = 0;
+#endif
+
+        /* Deal with systems that don't initialize birthtime correctly.
+         * Pointed out by SATOH Fumiyasu <fumiyas@osstech.jp>.
+         */
+        if (null_timespec(ret)) {
+                ret.tv_sec = calc_create_time(pst);
+                ret.tv_nsec = 0;
+        }
+        return ret;
 }
 

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

@@ -1380 +1380 @@
 }
 
-/****************************************************************************
- Create an outgoing TCP socket to any of the addrs. This is for
- simultaneous connects to port 445 and 139 of a host or even a variety
- of DC's all of which are equivalent for our purposes.
-**************************************************************************/
+/*******************************************************************
+ Create an outgoing TCP socket to the first addr that connects.
+
+ This is for simultaneous connection attempts to port 445 and 139 of a host
+ or for simultatneous connection attempts to multiple DCs at once.  We return
+ a socket fd of the first successful connection.
+
+ @param[in] addrs list of Internet addresses and ports to connect to
+ @param[in] num_addrs number of address/port pairs in the addrs list
+ @param[in] timeout time after which we stop waiting for a socket connection
+            to succeed, given in milliseconds
+ @param[out] fd_index the entry in addrs which we successfully connected to
+ @param[out] fd fd of the open and connected socket
+ @return true on a successful connection, false if all connection attempts
+         failed or we timed out
+*******************************************************************/
 
 bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,

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

@@ -2007 +2007 @@
 bool str_list_substitute(char **list, const char *pattern, const char *insert)
 {
+        TALLOC_CTX *ctx = list;
         char *p, *s, *t;
         ssize_t ls, lp, li, ld, i, d;
@@ -2029 +2030 @@
                         d = p -t;
                         if (ld) {
-                                t = (char *) SMB_MALLOC(ls +ld +1);
+                                t = TALLOC_ARRAY(ctx, char, ls +ld +1);
                                 if (!t) {
                                         DEBUG(0,("str_list_substitute: "
@@ -2037 +2038 @@
                                 memcpy(t, *list, d);
                                 memcpy(t +d +li, p +lp, ls -d -lp +1);
-                                SAFE_FREE(*list);
+                                TALLOC_FREE(*list);
                                 *list = t;
                                 ls += ld;